diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ab2b0fc7..451774b99 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1,35 @@ -If you are interested in contributing to this project, please visit the [Development](https://github.com/muammar/mkchromecast/wiki/development) section in the Wiki. +Contributing +============ + +If you want to contribute, help me improving this application by [reporting +issues](https://github.com/muammar/mkchromecast/issues), [creating pull +requests](https://github.com/muammar/mkchromecast/pulls) with your development/improvement. +If your case is the latter, visit +[Development](https://github.com/muammar/mkchromecast/wiki/development) section +in the Wiki. + +Other way of contributing is donating on my Paypal so I can drink a beer or eat +a Pizza :). +[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=RZLF7TDCAXT9Q&lc=US&item_name=mkchromecast¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) + +List of contributors +-------------------- + +| Author | loc | coms | fils | distribution | +| ----------------------- | ------ | ---- | ---- | ------------ | +| Muammar El Khatib | 354456 | 992 | 1248 | 100/98.8/99.0 | +| Morten Linderud | 35 | 2 | 4 | 0.0/ 0.2/ 0.3 | +| terencode | 22 | 2 | 1 | 0.0/ 0.2/ 0.1 | +| Elias Tandel Barrionovo | 15 | 2 | 1 | 0.0/ 0.2/ 0.1 | +| HairyFotr | 4 | 1 | 3 | 0.0/ 0.1/ 0.2 | +| Maccer1 | 3 | 1 | 1 | 0.0/ 0.1/ 0.1 | +| Matthew Aguirre | 1 | 1 | 1 | 0.0/ 0.1/ 0.1 | +| Guillaume Roche | 1 | 1 | 1 | 0.0/ 0.1/ 0.1 | +| Steindi01 | 0 | 1 | 0 | 0.0/ 0.1/ 0.0 | +| Ioan Loosley | 0 | 1 | 0 | 0.0/ 0.1/ 0.0 | + + +**Date**: Mon Jul 17 18:36:19 EDT 2017. + +A more up-to-date list can be see at +[mkchromecast/graphs/contributors](https://github.com/muammar/mkchromecast/graphs/contributors). diff --git a/Makefile b/Makefile index b720b24d6..6cba9e65e 100644 --- a/Makefile +++ b/Makefile @@ -54,16 +54,16 @@ debug: sed -i -e 's/tray = args.tray/tray = True/g' mkchromecast/__init__.py sed -i -e 's/debug = args.debug/debug = True/g' mkchromecast/__init__.py python3 setup.py py2app - cp -R /usr/local/Cellar/qt/5.8.0_2/plugins dist/mkchromecast.app/Contents/PlugIns - /usr/local/Cellar/qt/5.8.0_2/bin/macdeployqt dist/mkchromecast.app + cp -R /usr/local/Cellar/qt/5.9.1/plugins dist/Mkchromecast.app/Contents/PlugIns + /usr/local/Cellar/qt/5.9.1/bin/macdeployqt dist/Mkchromecast.app # This target creates a standalone app with debugging disabled deploy: sed -i -e 's/tray = args.tray/tray = True/g' mkchromecast/__init__.py sed -i -e 's/debug = args.debug/debug = False/g' mkchromecast/__init__.py python3 setup.py py2app - cp -R /usr/local/Cellar/qt/5.8.0_2/plugins dist/mkchromecast.app/Contents/PlugIns - /usr/local/Cellar/qt/5.8.0_2/bin/macdeployqt dist/mkchromecast.app -dmg + cp -R /usr/local/Cellar/qt/5.9.1/plugins dist/Mkchromecast.app/Contents/PlugIns + /usr/local/Cellar/qt/5.9.1/bin/macdeployqt dist/Mkchromecast.app -dmg # This cleans clean: diff --git a/README.md b/README.md index 0eb87e947..5fac44f88 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -mkchromecast +Mkchromecast ============ [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/muammar/mkchromecast/master/LICENSE) [![PyPI](https://img.shields.io/pypi/pyversions/pychromecast.svg?maxAge=2592000)](https://github.com/muammar/mkchromecast/) -[![node](https://img.shields.io/badge/node-7.10.0-yellow.svg)](https://github.com/muammar/mkchromecast/blob/master/nodejs/) +[![node](https://img.shields.io/badge/node-9.3.0-yellow.svg)](https://github.com/muammar/mkchromecast/blob/master/nodejs/) [![Downloads](https://img.shields.io/github/downloads/muammar/mkchromecast/total.svg?maxAge=2592000?style=flat-square)](https://github.com/muammar/mkchromecast/releases) [![GitHub release](https://img.shields.io/github/release/muammar/mkchromecast.svg)](https://github.com/muammar/mkchromecast/releases/latest) @@ -10,14 +10,14 @@ This is a program to cast your **macOS** audio, or **Linux** audio to your Google Cast devices or Sonos speakers. It can also [cast video files](#video). It is written in Python, and it can stream via `node.js`, `parec` (**Linux**), -`ffmpeg`, or `avconv`. **mkchromecast** is capable of using lossy and lossless +`ffmpeg`, or `avconv`. **Mkchromecast** is capable of using lossy and lossless audio formats provided that `ffmpeg`, `avconv` (**Linux**), or `parec` (**Linux**) are installed. It also supports [Multi-room group playback](https://support.google.com/chromecast/answer/6329016?hl=en), and [24-bit/96kHz high audio resolution](https://github.com/muammar/mkchromecast#high-quality-audio). Additionally, a system tray menu is available. -By default, **mkchromecast** streams with `node.js` (or `parec` in **Linux**) +By default, **Mkchromecast** streams with `node.js` (or `parec` in **Linux**) together with `mp3` audio coding format at a sample rate of `44100Hz` and average bitrate of `192k`. These defaults can be changed using the `--sample-rate` and `-b` flags. It is useful to modify these parameters when @@ -37,10 +37,10 @@ backends. Tell me more about it ---------------------- -To have an idea of using **mkchromecast** from console [check this +To have an idea of using **Mkchromecast** from console [check this gif](https://github.com/muammar/mkchromecast#usage). -**mkchromecast** provides a **beta** system tray menu. It requires you to +**Mkchromecast** provides a **beta** system tray menu. It requires you to install `PyQt5`. For more information check the [Requirements](https://github.com/muammar/mkchromecast#requirements) and [Install](https://github.com/muammar/mkchromecast#install) sections. @@ -66,7 +66,7 @@ Sonos support -------------- If you have Sonos speakers, you can play whatever you are listening to in your -computer with **mkchromecast**. To add Sonos support, install the `soco` python +computer with **Mkchromecast**. To add Sonos support, install the `soco` python module: ``` @@ -88,7 +88,7 @@ Requirements: #### macOS -In order to use **mkchromecast** you need the following software to stream with +In order to use **Mkchromecast** you need the following software to stream with `node.js`: * Python2 (already shipped in OS X), or Python3. @@ -103,7 +103,8 @@ following: * flask (optional). * ffmpeg (optional). -* youtube-dl (option if you plan to cast youtube URLs). +* youtube-dl (option if you plan to cast youtube URLs or [supported + websites](https://rg3.github.io/youtube-dl/supportedsites.html)). #### Linux @@ -122,8 +123,9 @@ following: * ffmpeg (optional). * avconv (optional). * PyQt5 (optional if you want to use the system tray menu). -* youtube-dl (optional if you plan to cast youtube URLs). -* soco (this module adds Sonos support to mkchromecast). +* youtube-dl (option if you plan to cast youtube URLs or [supported + websites](https://rg3.github.io/youtube-dl/supportedsites.html)). +* soco (this module adds Sonos support to Mkchromecast). For those who don't like Pulseaudio, it is possible to [cast using ALSA](https://github.com/muammar/mkchromecast/wiki/ALSA). In that case the @@ -145,8 +147,9 @@ requirements are: * ffmpeg. * avconv (optional). * PyQt5 (optional if you want to use the system tray menu). -* youtube-dl (optional if you plan to cast youtube URLs). -* soco (this module adds Sonos support to mkchromecast). +* youtube-dl (option if you plan to cast youtube URLs or [supported + websites](https://rg3.github.io/youtube-dl/supportedsites.html)). +* soco (this module adds Sonos support to Mkchromecast). Install @@ -185,7 +188,7 @@ here](https://github.com/muammar/mkchromecast/issues). * Debian (.deb): [https://packages.debian.org/mkchromecast](https://packages.debian.org/mkchromecast). * Ubuntu (.deb): [http://packages.ubuntu.com/search?keywords=mkchromecast](http://packages.ubuntu.com/search?keywords=mkchromecast). -**mkchromecast** is available in the [official Debian +**Mkchromecast** is available in the [official Debian repositories](https://packages.debian.org/mkchromecast). To install it, just do: @@ -225,7 +228,7 @@ apt-get install mkchromecast-pulseaudio (Pulseaudio users) #### From sources -To install **mkchromecast**, clone this repository: +To install **Mkchromecast**, clone this repository: ``` git clone https://github.com/muammar/mkchromecast.git @@ -236,7 +239,7 @@ here](https://github.com/muammar/mkchromecast/releases), and unzip the file. ##### Arch Linux -mkchromecast is available at the AUR : [https://aur.archlinux.org/packages/mkchromecast-git/](https://aur.archlinux.org/packages/mkchromecast-git/). +Mkchromecast is available at the AUR : [https://aur.archlinux.org/packages/mkchromecast-git/](https://aur.archlinux.org/packages/mkchromecast-git/). ```bash #install with yaourt @@ -319,15 +322,14 @@ Homebrew installed in your machine: Once Homebrew is ready, you can install `ffmpeg`. As stated in the [ffmpeg website](https://trac.ffmpeg.org/wiki/CompilationGuide/MacOSX), and for being -able to use all audio coding formats in **mkchromecast**, it is better to +able to use all audio coding formats in **Mkchromecast**, it is better to install `ffmpeg` with the following options enabled: ``` -brew install ffmpeg --with-fdk-aac --with-tools --with-freetype --with-libass --with-libvorbis --with-libvpx --with-x265 - +brew install ffmpeg --with-fdk-aac --with-tools --with-freetype --with-libass --with-libvorbis --with-libvpx --with-x265 --with-opus ``` -**mkchromecast** does not support `avconv` in **macOS**. +**Mkchromecast** does not support `avconv` in **macOS**. ###### Linux @@ -350,6 +352,7 @@ apt-get install libav-tools `mp3` | MPEG Audio Layer III (default) | Lossy compression format (default bitrate: 192k) `ogg` | Ogg Vorbis | Lossy compression format (default bitrate: 192k) `aac` | Advanced Audio Coding (AAC) | Lossy compression format (default bitrate: 192k) + `opus` | Opus | Lossy compression format (default bitrate: 192k) `wav` | Waveform Audio File Format | Lossless format (HQ sound) `flac` | Free Lossless Audio Codec | Lossless format (HQ sound) @@ -393,14 +396,14 @@ or if you desire it you can do it yourself from the sources. Updating -------- -To update **mkchromecast** sources, just get into the cloned directory and: +To update **Mkchromecast** sources, just get into the cloned directory and: ``` git pull ``` or if you prefer it, you can just pass the `--update` argument to -**mkchromecast**: +**Mkchromecast**: ``` python mkchromecast.py --update @@ -423,33 +426,33 @@ Usage #### Audio -Get into the cloned **mkchromecast** directory and execute: +Get into the cloned **Mkchromecast** directory and execute: ``` python mkchromecast.py ``` -This will launch **mkchromecast** using `node.js` (or `parec` for **Linux** +This will launch **Mkchromecast** using `node.js` (or `parec` for **Linux** users), and will do the streaming part together with the `mp3` audio coding format. `node.js` works decently but the server may tend to _fail_ under certain -circumstances. In such a case, **mkchromecast** is able to restart the +circumstances. In such a case, **Mkchromecast** is able to restart the _streaming/casting_ process automatically. So, some hiccups are expected. **Note**: most of the steps described herein are the same for **macOS** and **Linux** users. However, if you launch the command above in **Linux**, the process is less automatized. In **Linux**, you need to select with `pavucontrol` the sink -called `mkchromecast` to stream unless you are using [ALSA](https://github.com/muammar/mkchromecast/wiki/ALSA). +called `Mkchromecast` to stream unless you are using [ALSA](https://github.com/muammar/mkchromecast/wiki/ALSA). See the [wiki for more information](https://github.com/muammar/mkchromecast/wiki/Linux). tl;dr?, just check the gif below. ![Example of using mkchromecast](https://raw.githubusercontent.com/muammar/mkchromecast/master/images/mkchromecast_linux.gif) **Note**: the cast process is independent from the selection of the pulseaudio -sink. This means that **mkchromecast** will tell the cast device to listen your +sink. This means that **Mkchromecast** will tell the cast device to listen your computer but no sound will be heard until you select the sink. For ALSA users, this does not apply. -##### Using the `ffmpeg` backend with **mkchromecast** installed from sources +##### Using the `ffmpeg` backend with **Mkchromecast** installed from sources Below an example using `mp3`: @@ -480,7 +483,7 @@ than one active network connection or when the automatically ip detection fails: python mkchromecast.py --host 192.168.1.1 ``` -##### Other examples with **mkchromecast** installed using the debian package +##### Other examples with **Mkchromecast** installed using the debian package To cast using `parec` and `wav` audio coding format: ``` @@ -502,7 +505,7 @@ mkchromecast --encoder-backend ffmpeg -c ogg -b 128 --sample-rate 48000 **Note**: to use `avconv` just replace from `ffmpeg` to `avconv` in the commands above. -##### Using **mkchromecast** from the system tray +##### Using **Mkchromecast** from the system tray To launch it: @@ -521,7 +524,9 @@ here](https://github.com/muammar/mkchromecast#macos). #### Playing Youtube URLs in Google Cast devices -You can play Youtube URLs headlessly from the command line: +You can play Youtube URLs (or [other +sites](https://rg3.github.io/youtube-dl/supportedsites.html) headlessly from +the command line: ``` python mkchromecast.py -y https://www.youtube.com/watch\?v\=NVvAJhZVBT @@ -531,7 +536,8 @@ To use this function, you need to install `youtube-dl`. In macOS, this can be done with homebrew: `brew install youtube-dl`. In Debian based distros: `apt-get install youtube-dl`. -**Note**: you may need to enclose the URL between quotation marks. +**Note**: you may need to enclose the URL between quotation marks, and only +URLs over `https` are supported. #### Playing source URLs in Google Cast devices @@ -560,7 +566,7 @@ As it can be seen above, **the codec has to be specified with the `-c` flag**. #### Controlling the Google Cast's volume and pause/resume options You can control the volume of your Google Cast device by launching -**mkchromecast** with the option `--control`: +**Mkchromecast** with the option `--control`: ``` python mkchromecast.py --encoder-backend ffmpeg -c ogg -b 320 --control @@ -573,7 +579,7 @@ The system tray has a window with a volume slider to do `volume up` and `volume #### High quality audio -**mkchromecast** lets you cast using `24-bit/96kHz` high audio resolution. This +**Mkchromecast** lets you cast using `24-bit/96kHz` high audio resolution. This is the *maximum chromecast audio capability*. The supported codecs are: `wav` and `flac`. In spite of the fact that `aac` can use `96000Hz` sample rate, the bitrate corresponds to that of a lossy data compression format. Therefore, the @@ -589,7 +595,7 @@ References: #### Video -You can now cast videos to your Google cast using **mkchromecast**. This feature works both with `node` +You can now cast videos to your Google cast using **Mkchromecast**. This feature works both with `node` and `ffmpeg` backends and from command line. In the future, they may be a graphical interface for this process. [See this project](https://github.com/muammar/mkchromecast/projects/1). @@ -633,7 +639,7 @@ python mkchromecast.py -y https://www.youtube.com/watch\?v\=VuMBaAZn3II --video Killing the application ----------------------- -To kill **mkchromecast** when you run it from console, just press +To kill **Mkchromecast** when you run it from console, just press Ctrl-C or q key to quit (when `--control` flag is passed). When launching from system tray, use the `Quit` button in the system tray. @@ -658,7 +664,7 @@ Known issues ------------ ##### General -* **mkchromecast**'s versions lower than 0.3.7 cannot operate with newer +* **Mkchromecast**'s versions lower than 0.3.7 cannot operate with newer versions of pychromecast. * When casting videos using the `node` backend, it is not possible to use neither the `--subtitle` nor the `--seek` flags. @@ -668,7 +674,7 @@ Known issues ##### macOS -* **mkchromecast** v0.3.6 cannot connect to selected chromecast when there are +* **Mkchromecast** v0.3.6 cannot connect to selected chromecast when there are more than one available. In that case, you need to use the application from sources or build the application as shown [here](https://github.com/muammar/mkchromecast/wiki/macOS-standalone-app). diff --git a/archive/mkchromecast.png b/archive/mkchromecast.png deleted file mode 100644 index 2a25e91cc..000000000 Binary files a/archive/mkchromecast.png and /dev/null differ diff --git a/changelog.md b/changelog.md index c3c31df7c..3c5c8e154 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,28 @@ +* mkchromecast (0.3.8) **2017/12/23** + + - Improved stability. + - The macOS bundle is now renamed with capital M, and will not be showing + in the dock. + - Chunk size changed from 1024 to 64. Added two more variables that + decreases the delay considerably. + - Improved ffmpeg commands for pulseaudio part of the code. + - node streaming updated to work with `node v9.3.0`. + - Manpage is now shipped in main branches. + - TypeError caused by a print statement for Soco devices has been fixed. + Closes #80. + - Added Opus codec support. + - It is now possible to screencast using mkchromecast. + - Using the `--youtube` flag works with all supported websites by youtube-dl. + - Correct signal handling using the `signal` module. PR #87 by @Foxboron. + - Renamed `--reconnect` to `--hijack`. Closes #25. + - New flag `tries` to to limit the number of tries to connect to + a chromecast. Closes #54. + - Allow custom server port with ffmpeg or avconv. Related to #122. + - Error with "width not divisible by 2 (853x480)". Closes issue #119. + - The `segment_time` flag has been fixed. Closes issue #71. + - New flag `command` for setting a custom ffmpeg command. Closes issue + #109. + * mkchromecast (0.3.7.1) **2017/05/21** - macOS bundle built in Yosemite to add more compatibility. @@ -276,4 +301,3 @@ - In this beta release, the program casts to the first google cast found in the list. If the node streaming server fails, the program reconnects. - diff --git a/man/mkchromecast.1 b/man/mkchromecast.1 new file mode 100644 index 000000000..89734dd4b --- /dev/null +++ b/man/mkchromecast.1 @@ -0,0 +1,52 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" (C) Copyright 2016 Muammar El Khatib , +.\" +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH Mkchromecast "1" "March 30 2017" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +mkchromecast \- cast audio and video to Google cast devices +.SH SYNOPSIS +.B mkchromecast +.RI [ options ] +.SH DESCRIPTION +This manual page documents briefly the +.B mkchromecast +commands. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBmkchromecast\fP is a program that allows you to cast your audio or video +files to your Google cast devices. +.SH OPTIONS +This program follows the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +For a complete description, see the Info files. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-v, \-\-version +Show version of program. +.SH SEE ALSO +.\".BR bar (1), +.\".BR baz (1). +.\".br +The program is documented fully executing +.IR "mkchromecast -h" , +that should give you complete access to the usage. diff --git a/mkchromecast.desktop b/mkchromecast.desktop new file mode 100644 index 000000000..155a2fa12 --- /dev/null +++ b/mkchromecast.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=mkchromecast +Comment=Cast your Linux audio or video files to your Google cast or Sonos devices +Exec=/usr/bin/mkchromecast -t +Terminal=false +Type=Application +Icon=/usr/share/pixmaps/mkchromecast.xpm +Categories=AudioVideo;Audio; +Keywords=audio;chromecast;google;cast;pychromecast; diff --git a/mkchromecast.py b/mkchromecast.py index 415e30af6..d687dd11f 100644 --- a/mkchromecast.py +++ b/mkchromecast.py @@ -13,6 +13,8 @@ import os.path import time import atexit +import signal + class mk(object): """Class to manage cast process""" @@ -32,8 +34,8 @@ def __init__(self): self.control = mkchromecast.__init__.control self.cc = casting() - checkmktmp() - writePidFile() + mkchromecast.__init__.checkmktmp() + mkchromecast.__init__.writePidFile() """ Initializing backend array @@ -46,22 +48,23 @@ def __init__(self): ] self.check_connection() - if self.tray == False and self.videoarg == False: + if self.tray is False and self.videoarg is False: if self.platform == 'Linux': self.audio_linux() else: self.audio_macOS() - elif self.tray == False and self.videoarg == True: + elif self.tray is False and self.videoarg is True: self.cast_video() else: self.start_tray() def audio_linux(self): """This method manages all related to casting audio in Linux""" - if self.youtubeurl == None and self.source_url == None: - if adevice == None: + if self.youtubeurl is None and self.source_url is None: + if self.adevice is None: print('Creating Pulseaudio Sink...') - print(colors.warning('Open Pavucontrol and Select the Mkchromecast Sink.')) + print(colors.warning('Open Pavucontrol and Select the ' + 'Mkchromecast Sink.')) create_sink() print(colors.important('Starting Local Streaming Server')) print(colors.success('[Done]')) @@ -71,14 +74,15 @@ def audio_linux(self): self.cc.play_cast() self.show_control(self.control) - elif self.youtubeurl == None and self.source_url != None: + elif self.youtubeurl is None and self.source_url is not None: self.start_backend(self.encoder_backend) self.cc.initialize_cast() self.get_cc(self.select_cc) self.cc.play_cast() self.show_control(self.control) - elif youtubeurl != None and self.videoarg == False: # When casting youtube url, we do it through the audio module + # When casting youtube url, we do it through the audio module + elif youtubeurl is not None and self.videoarg is False: import mkchromecast.audio mkchromecast.audio.main() self.cc.initialize_cast() @@ -88,7 +92,7 @@ def audio_linux(self): def audio_macOS(self): """This method manages all related to casting audio in macOS""" - if self.youtubeurl == None and self.source_url == None: + if self.youtubeurl is None and self.source_url is None: self.start_backend(self.encoder_backend) self.cc.initialize_cast() self.get_cc(self.select_cc) @@ -100,7 +104,7 @@ def audio_macOS(self): self.cc.play_cast() self.show_control(self.control) - elif self.youtubeurl == None and self.source_url != None: + elif self.youtubeurl is None and self.source_url is not None: self.start_backend(self.encoder_backend) self.cc.initialize_cast() self.get_cc(self.select_cc) @@ -114,7 +118,8 @@ def audio_macOS(self): self.cc.play_cast() self.show_control(self.control) - elif self.youtubeurl != None and self.videoarg == False: # When casting youtube url, we do it through the audio module + # When casting youtube url, we do it through the audio module + elif self.youtubeurl is not None and self.videoarg is False: import mkchromecast.audio mkchromecast.audio.main() self.cc.initialize_cast() @@ -136,7 +141,8 @@ def get_cc(self, select_cc): """Get chromecast name, and let user select one from a list if select_cc flag is True. """ - if select_cc == True: # This is done for the case that -s is passed + # This is done for the case that -s is passed + if select_cc is True: self.cc.sel_cc() self.cc.inp_cc() self.cc.get_cc() @@ -145,29 +151,30 @@ def get_cc(self, select_cc): def start_backend(self, encoder_backend): """Starting backends""" - if encoder_backend == 'node' and self.source_url == None: + if encoder_backend == 'node' and self.source_url is None: from mkchromecast.node import stream stream() - elif encoder_backend in self.backends and self.source_url == None: + elif encoder_backend in self.backends and self.source_url is None: import mkchromecast.audio mkchromecast.audio.main() def check_connection(self): """Check if the computer is connected to a network""" if self.cc.ip == '127.0.0.1': # We verify the local IP. - print(colors.error('Your Computer is not Connected to Any Network')) + print(colors.error('Your Computer is not Connected to Any ' + 'Network')) terminate() - elif self.cc.ip != '127.0.0.1' and self.discover == True: + elif self.cc.ip != '127.0.0.1' and self.discover is True: self.cc.initialize_cast() terminate() def terminate_app(self): """Terminate the app (kill app)""" self.cc.stop_cast() - if platform == 'Darwin': + if self.platform == 'Darwin': inputint() outputint() - elif platform == 'Linux' and adevice == None: + elif self.platform == 'Linux' and self.adevice is None: remove_sink() terminate() @@ -179,7 +186,7 @@ def controls_msg(self): print('') print(colors.options( 'Volume Up:')+' u') print(colors.options( 'Volume Down:')+' d') - if videoarg == True: + if self.videoarg is True: print(colors.options( 'Pause Casting:')+' p') print(colors.options( 'Resume Casting:')+' r') print(colors.options('Quit the Application:')+' q or Ctrl-C') @@ -187,7 +194,7 @@ def controls_msg(self): def show_control(self, control): """Method to show controls""" - if control == True: + if self.control is True: from mkchromecast.getch import getch, pause self.controls_msg() @@ -197,30 +204,30 @@ def show_control(self, control): if(key == 'u'): self.cc.volume_up() if self.encoder_backend == 'ffmpeg': - if self.debug == True: + if self.debug is True: self.controls_msg() elif(key == 'd'): self.cc.volume_down() if self.encoder_backend == 'ffmpeg': - if self.debug == True: + if self.debug is True: self.controls_msg() elif(key == 'p'): - if self.videoarg == True: + if self.videoarg is True: print('Pausing Casting Process...') action = 'pause' self.backend_handler(action, self.encoder_backend) if self.encoder_backend == 'ffmpeg': - if self.debug == True: + if self.debug is True: self.controls_msg() else: pass elif(key == 'r'): - if self.videoarg == True: + if self.videoarg is True: print('Resuming Casting Process...') action = 'resume' self.backend_handler(action, self.encoder_backend) if self.encoder_backend == 'ffmpeg': - if self.debug == True: + if self.debug is True: self.controls_msg() else: pass @@ -234,15 +241,17 @@ def show_control(self, control): self.terminate_app() else: - if self.platform == 'Linux' and self.adevice == None: - print(colors.warning('Remember to open pavucontrol and select the mkchromecast sink.')) + if self.platform == 'Linux' and self.adevice is None: + print(colors.warning('Remember to open pavucontrol and select ' + 'the mkchromecast sink.')) print('') print(colors.error('Ctrl-C to kill the Application at any Time')) print('') - try: - input() - except KeyboardInterrupt: - atexit.register(self.terminate_app()) + signal.signal(signal.SIGINT, + lambda *_: atexit.register(self.terminate_app())) + signal.signal(signal.SIGTERM, + lambda *_: atexit.register(self.terminate_app())) + signal.pause() def backend_handler(self, action, backend): """Methods to handle pause and resume state of backends""" @@ -250,20 +259,24 @@ def backend_handler(self, action, backend): subprocess.call(['pkill', '-STOP', '-f', 'ffmpeg']) elif action == 'resume' and backend == 'ffmpeg': subprocess.call(['pkill', '-CONT', '-f', 'ffmpeg']) - elif action == 'pause' and backend == 'node' and self.platform == 'Linux': + elif (action == 'pause' and backend == 'node' and + self.platform == 'Linux'): subprocess.call(['pkill', '-STOP', '-f', 'nodejs']) - elif action == 'resume' and backend == 'node' and self.platform == 'Linux': + elif (action == 'resume' and backend == 'node' and + self.platform == 'Linux'): subprocess.call(['pkill', '-CONT', '-f', 'nodejs']) - elif action == 'pause' and backend == 'node' and self.platform == 'Darwin': + elif (action == 'pause' and backend == 'node' and + self.platform == 'Darwin'): subprocess.call(['pkill', '-STOP', '-f', 'node']) - elif action == 'resume' and backend == 'node' and self.platform == 'Darwin': + elif (action == 'resume' and backend == 'node' and + self.platform == 'Darwin'): subprocess.call(['pkill', '-CONT', '-f', 'node']) def start_tray(self): """This method starts the system tray""" import mkchromecast.systray - checkmktmp() - writePidFile() + mkchromecast.__init__.checkmktmp() + mkchromecast.__init__.writePidFile() mkchromecast.systray.main() if __name__ == "__main__": diff --git a/mkchromecast/__init__.py b/mkchromecast/__init__.py index 30280a622..e6e2f86c1 100644 --- a/mkchromecast/__init__.py +++ b/mkchromecast/__init__.py @@ -1,10 +1,11 @@ #!/usr/bin/env python -# This file is part of mkchromecast. +# This file is part of Mkchromecast. import mkchromecast.colors as colors -from mkchromecast.utils import terminate +from mkchromecast.utils import terminate, check_url from mkchromecast.version import __version__ +from mkchromecast.resolution import resolutions import argparse import os.path import sys @@ -14,474 +15,535 @@ from argparse import RawTextHelpFormatter parser = argparse.ArgumentParser( -description=''' -This is a program to cast your macOS audio, or Linux audio to your Google Cast -devices. + description=''' + This is a program to cast your macOS audio, or Linux audio to your Google + Cast devices. -It is written in Python, and it can stream via node.js, ffmpeg, parec (Linux -pulseaudio users), avconv (Linux only) or ALSA (Linux users). mkchromecast is -capable of using lossy and lossless audio formats provided that ffmpeg, avconv -or parec is installed. Additionally, a system tray menu is available. + It is written in Python, and it can stream via node.js, ffmpeg, parec + (Linux pulseaudio users), avconv (Linux only) or ALSA (Linux users). + Mkchromecast is capable of using lossy and lossless audio formats provided + that ffmpeg, avconv or parec is installed. Additionally, a system tray + menu is available. -Linux users that have installed the debian package need to launch the command -`mkchromecast`, e.g.: + Linux users that have installed the debian package need to launch the + command `mkchromecast`, e.g.: - mkchromecast + mkchromecast -whereas, installation from source needs users to go inside the cloned git -repository and execute: + whereas, installation from source needs users to go inside the cloned git + repository and execute: - python mkchromecast.py + python mkchromecast.py -The two examples above will make mkchromecast streams with node.js (or parec in -Linux) together with mp3 audio coding format at a sample rate of 44100Hz and an -average bitrate of 192k (defaults). These defaults can be changed using the ---sample-rate and -b flags. It is useful to modify these parameters when your -wireless router is not very powerful, or in the case you don't want to degrade -the sound quality. For more information visit the wiki and the FAQ -https://github.com/muammar/mkchromecast/wiki/. + The two examples above will make Mkchromecast streams with node.js (or + parec in Linux) together with mp3 audio coding format at a sample rate of + 44100Hz and an average bitrate of 192k (defaults). These defaults can be + changed using the --sample-rate and -b flags. It is useful to modify these + parameters when your wireless router is not very powerful, or in the case + you don't want to degrade the sound quality. For more information visit the + wiki and the FAQ https://github.com/muammar/mkchromecast/wiki/. -''', -formatter_class=RawTextHelpFormatter -) - -parser.add_argument( -'--alsa-device', -type=str, -default=None, -help= -''' -Set the ALSA device name. This option is useful when you are using pure -ALSA in your system. + ''', + formatter_class=RawTextHelpFormatter + ) -Example: - python mkchromecast.py --encoder-backend ffmpeg --alsa-device hw:2,1 +parser.add_argument( + '--alsa-device', + type=str, + default=None, + help=''' + Set the ALSA device name. This option is useful when you are using pure + ALSA in your system. + + Example: + python mkchromecast.py --encoder-backend ffmpeg --alsa-device hw:2,1 + + It only works for the ffmpeg and avconv backends, and it is not useful for + pulseaudio users. For more information read the README.Debian file shipped + in the Debian package or https://github.com/muammar/mkchromecast/wiki/ALSA. + ''' + ) + +parser.add_argument( + '-b', + '--bitrate', + type=int, + default='192', + help=''' + Set the audio encoder's bitrate. The default is set to be 192k average + bitrate. + + Example: + + ffmpeg: + python mkchromecast.py --encoder-backend ffmpeg -c ogg -b 128 -It only works for the ffmpeg and avconv backends, and it is not useful for -pulseaudio users. For more information read the README.Debian file shipped in -the Debian package or https://github.com/muammar/mkchromecast/wiki/ALSA. -''' -) + node: + python mkchromecast.py -b 128 + + This option works with all backends. The example above sets the average + bitrate to 128k. + ''' + ) parser.add_argument( -'-b', -'--bitrate', -type=int, -default='192', -help= -''' -Set the audio encoder's bitrate. The default is set to be 192k average bitrate. + '--chunk-size', + type=int, + default='64', + help=''' + Set the chunk size base for streaming in the Flask server. Default to 64. + This option only works when using the ffmpeg or avconv backends. This + number is the base to set both the buffer_size (defined by + 2 * chunk_size**2) in Flask server and the frame_size (defined by 32 + * chunk_size). + + Example: + + ffmpeg: + python mkchromecast.py --encoder-backend ffmpeg -c ogg -b 128 --chunk-size 2048 + + avconv: + python mkchromecast.py --encoder-backend avconv -c ogg -b 128 --chunk-size 64 -Example: - -ffmpeg: - python mkchromecast.py --encoder-backend ffmpeg -c ogg -b 128 - -node: - python mkchromecast.py -b 128 - -This option works with all backends. The example above sets the average -bitrate to 128k. -''' -) - -parser.add_argument( -'--chunk-size', -type=int, -default='1024', -help= -''' -Set the chunk size for streaming in the Flask server. Default to 1024. This -option only works when using the ffmpeg or avconv backends. - -Example: - -ffmpeg: - python mkchromecast.py --encoder-backend ffmpeg -c ogg -b 128 --chunk-size 2048 - -avconv: - python mkchromecast.py --encoder-backend avconv -c ogg -b 128 --chunk-size 512 -''' -) - -parser.add_argument( -'-c', -'--codec', -type=str, -default='mp3', -help= -''' -Set the audio codec. - -Example: - python mkchromecast.py --encoder-backend ffmpeg -c ogg - -Possible codecs: - - mp3 [192k] MPEG Audio Layer III (default) - - ogg [192k] Ogg Vorbis - - aac [192k] Advanced Audio Coding (AAC) - - wav [HQ] Waveform Audio File Format - - flac [HQ] Free Lossless Audio Codec - -This option only works for the ffmpeg, avconv and parec backends. -''' -) - -parser.add_argument( -'--config', -action='store_true', -help=''' -Use this option to connect from configuration file. -''' -) - -parser.add_argument( -'--control', -action='store_true', -default=False, -help=''' -Control some actions of your Google Cast Devices. Use the 'u' and 'd' keys to -perform volume up and volume down respectively, or press 'p' and 'r' to pause -and resume cast process (only works with ffmpeg). Note that to kill the -application using this option, you need to press the 'q' key or 'Ctrl-c'. -''' -) - - -parser.add_argument( -'--debug', -action='store_true', -help=''' -Option for debugging purposes. -''' -) - -parser.add_argument( -'-d', -'--discover', -action='store_true', -default=False, -help=''' -Use this option if you want to know the friendly name of a Google Cast device. -''' -) - -parser.add_argument( -'--encoder-backend', -type=str, -default=None, -help= -''' -Set the backend for all encoders. -Possible backends: - - node (default in macOS) - - parec (default in Linux) - - ffmpeg - - avconv - - gstreamer - -Example: - python mkchromecast.py --encoder-backend ffmpeg -''' -) - -parser.add_argument( -'--host', -type=str, -default=None, -help= -''' -Set the ip of the local host. This option is useful if the local ip of your -computer is not being detected correctly, or in the case you have more than one -network device available. - -Example: - python mkchromecast.py --encoder-backend ffmpeg --host 192.168.1.1 - -You can pass it to all available backends. -''' -) - -parser.add_argument( -'-i', -'--input-file', -type=str, -default=None, -help=''' -Stream a file. - -Example: - python mkchromecast.py -i /path/to/file.mp4 -''' -) - -parser.add_argument( -'-n', -'--name', -type=str, -default=None, -help=''' -Use this option if you know the name of the Google Cast you want to connect. - -Example: - python mkchromecast.py -n mychromecast -''' -) - -parser.add_argument( -'--notifications', -action='store_true', -help=''' -Use this flag to enable the notifications. -''' -) - - -parser.add_argument( -'-r', -'--reset', -action='store_true', -help=''' -When the application fails, and you have no audio in your computer, use this -option to reset the computer's audio. -''' -) - -parser.add_argument( -'--reboot', -action='store_true', -help=''' -Reboot the Google Cast device. -''' -) - -parser.add_argument( -'--reconnect', -action='store_true', -default=False, -help=''' -This flag monitors if connection with google cast has been lost, and try to -reconnect. -''' -) - -parser.add_argument( -'--resolution', -type=str, -default=None, -help=''' -Set the resolution of the streamed video. The following resolutions are supported: - - - 480p. - - 720p (1280x720). - - 1080p (1920x1080). - - 2K. - - UHD (3840x2160). - - 4K (4096x2160). -''' -) + ''' + ) parser.add_argument( -'-s', -'--select-cc', -action='store_true', -help=''' -If you have more than one Google Cast device use this option. -''' -) - + '-c', + '--codec', + type=str, + default='mp3', + help=''' + Set the audio codec. + + Example: + python mkchromecast.py --encoder-backend ffmpeg -c ogg + + Possible codecs: + - mp3 [192k] MPEG Audio Layer III (default) + - ogg [192k] Ogg Vorbis + - aac [192k] Advanced Audio Coding (AAC) + - wav [HQ] Waveform Audio File Format + - flac [HQ] Free Lossless Audio Codec + + This option only works for the ffmpeg, avconv and parec backends. + ''' + ) + parser.add_argument( -'--sample-rate', -type=int, -default='44100', -help=''' -Set the sample rate. The default sample rate obtained from avfoundation audio -device input in ffmpeg using soundflower for macOS is 44100Hz (in Linux can be -44100Hz or 48000Hz). You can change this in the Audio MIDI Setup in the -"Soundflower (2ch)" audio device. You need to change the "Format" in both -input/output from 44100Hz to maximum 96000Hz. I think that more than 48000Hz -is not necessary, but this is up to the users' preferences. + '--command', + type=str, + default=None, + help=''' + Set a ffmpeg or avconv command for streaming video. + + Example: + python3 mkchromecast.py --video --command 'ffmpeg -re -i \ + /path/to/myvideo.mp4 -map_chapters -1 -vcodec libx264 -preset ultrafast \ + -tune zerolatency -maxrate 10000k -bufsize 20000k -pix_fmt yuv420p -g \ + 60 -f mp4 -max_muxing_queue_size 9999 -movflags \ + frag_keyframe+empty_moov pipe:1' + + Note that for the output you have to use pipe:1 to stream. This option only + works for the ffmpeg, avconv backends. + ''' + ) -Note that re-sampling to higher sample rates is not a good idea. It was indeed -an issue in the chromecast audio. See: https://goo.gl/yNVODZ. - -Example: - -ffmpeg: - python mkchromecast.py --encoder-backend ffmpeg -c ogg -b 128 --sample-rate 32000 +parser.add_argument( + '--config', + action='store_true', + help=''' + Use this option to connect from configuration file. + ''' + ) -node: - python mkchromecast.py -b 128 --sample-rate 32000 +parser.add_argument( + '--control', + action='store_true', + default=False, + help=''' + Control some actions of your Google Cast Devices. Use the 'u' and 'd' keys + to perform volume up and volume down respectively, or press 'p' and 'r' to + pause and resume cast process (only works with ffmpeg). Note that to kill + the application using this option, you need to press the 'q' key or + 'Ctrl-c'. + ''' + ) -This option works for both backends. The example above sets the sample rate to -32000Hz, and the bitrate to 128k. +parser.add_argument( + '--debug', + action='store_true', + help=''' + Option for debugging purposes. + ''' + ) -Which sample rate to use? - - - 192000Hz: maximum sampling rate supported in google cast audio without - using High Dynamic Range. Only supported by aac, wav and flac codecs. - - 96000Hz: maximum sampling rate supported in google cast audio using High - Dynamic Range. Only supported by aac, wav and flac codecs. - - 48000Hz: sampling rate of audio in DVDs. - - 44100Hz: sampling rate of audio CDs giving a 20 kHz maximum frequency. - - 32000Hz: sampling rate of audio quality a little below FM radio bandwidth. - - 22050Hz: sampling rate of audio quality of AM radio. +parser.add_argument( + '-d', + '--discover', + action='store_true', + default=False, + help=''' + Use this option if you want to know the friendly name of a Google Cast + device. + ''' + ) -For more information see: http://wiki.audacityteam.org/wiki/Sample_Rates. -''' -) +parser.add_argument( + '--encoder-backend', + type=str, + default=None, + help=''' + Set the backend for all encoders. + Possible backends: + - node (default in macOS) + - parec (default in Linux) + - ffmpeg + - avconv + - gstreamer + + Example: + python mkchromecast.py --encoder-backend ffmpeg + ''' + ) parser.add_argument( -'--seek', -type=str, -default=None, -help= -''' -Option to seeking when casting video. The format to set the time is HH:MM:SS. + '--host', + type=str, + default=None, + help=''' + Set the ip of the local host. This option is useful if the local ip of your + computer is not being detected correctly, or in the case you have more than + one network device available. -Example: - python mkchromecast.py --video -i "/path/to/file.mp4" --seek 00:23:00 + Example: + python mkchromecast.py --encoder-backend ffmpeg --host 192.168.1.1 -''' -) + You can pass it to all available backends. + ''' + ) parser.add_argument( -'--segment-time', -type=int, -default=None, -help= -''' -Segmentate audio for improved live streaming when using ffmpeg. + '-i', + '--input-file', + type=str, + default=None, + help=''' + Stream a file. + + Example: + python mkchromecast.py -i /path/to/file.mp4 + ''' + ) -Example: - python mkchromecast.py --encoder-backend ffmpeg --segment-time 2 +parser.add_argument( + '-n', + '--name', + type=str, + default=None, + help=''' + Use this option if you know the name of the Google Cast you want to + connect. + + Example: + python mkchromecast.py -n mychromecast + ''' + ) -''' -) +parser.add_argument( + '--notifications', + action='store_true', + help=''' + Use this flag to enable the notifications. + ''' + ) parser.add_argument( -'--source-url', -type=str, -default=None, -help= -''' -This option allows you to pass any source URL to your Google Cast device. You -have to specify the codec with -c flag when using it. + '-p', + '--port', + type=int, + default='5000', + help=''' + Set the listening port for local webserver. -Example: + Example: -Source URL, port and extension: - python mkchromecast.py --source-url http://192.99.131.205:8000/pvfm1.ogg -c ogg --control + ffmpeg: + python mkchromecast.py --encoder-backend ffmpeg -p 5100 -Source URL, no port, and extension: - python mkchromecast.py --source-url http://example.com/name.ogg -c ogg --control + ''' + ) -Source URL without extension: - python mkchromecast.py --source-url http://example.com/name -c aac --control +parser.add_argument( + '-r', + '--reset', + action='store_true', + help=''' + When the application fails, and you have no audio in your computer, use + this option to reset the computer's audio. + ''' + ) -Supported source URLs are: +parser.add_argument( + '--reboot', + action='store_true', + help=''' + Reboot the Google Cast device. + ''' + ) - - http://url:port/name.mp3 - - http://url:port/name.ogg - - http://url:port/name.mp4 (use the aac codec) - - http://url:port/name.wav - - http://url:port/name.flac +parser.add_argument( + '--hijack', + action='store_true', + default=False, + help=''' + This flag monitors if connection with google cast has been lost, and try to + hijack it. + ''' + ) + +parser.add_argument( + '--resolution', + type=str, + default=None, + help=''' + Set the resolution of the streamed video. The following resolutions are + supported: -.m3u or .pls are not yet available. -''' -) + ''' + + "\n".join(" - {0} ({2}).".format(k, *v) for k, v in resolutions.items()) + ) parser.add_argument( -'--subtitles', -type=str, -default=None, -help= -''' -Set subtitles. -''' -) + '-s', + '--select-cc', + action='store_true', + help=''' + If you have more than one Google Cast device use this option. + ''' + ) parser.add_argument( -'-t', -'--tray', -action='store_true', -help=''' -This option let you launch mkchromecast as a systray menu (beta). -''' -) + '--sample-rate', + type=int, + default='44100', + help=''' + Set the sample rate. The default sample rate obtained from avfoundation + audio device input in ffmpeg using soundflower for macOS is 44100Hz (in + Linux can be 44100Hz or 48000Hz). You can change this in the Audio MIDI + Setup in the "Soundflower (2ch)" audio device. You need to change the + "Format" in both input/output from 44100Hz to maximum 96000Hz. I think + that more than 48000Hz is not necessary, but this is up to the users' + preferences. + + Note that re-sampling to higher sample rates is not a good idea. It was + indeed an issue in the chromecast audio. See: https://goo.gl/yNVODZ. + + Example: + + ffmpeg: + python mkchromecast.py --encoder-backend ffmpeg -c ogg -b 128 --sample-rate 32000 + + node: + python mkchromecast.py -b 128 --sample-rate 32000 + + This option works for both backends. The example above sets the sample rate + to 32000Hz, and the bitrate to 128k. + + Which sample rate to use? + + - 192000Hz: maximum sampling rate supported in google cast audio + without using High Dynamic Range. Only supported by aac, wav and flac + codecs. + - 96000Hz: maximum sampling rate supported in google cast audio using + High Dynamic Range. Only supported by aac, wav and flac codecs. + - 48000Hz: sampling rate of audio in DVDs. + - 44100Hz: sampling rate of audio CDs giving a 20 kHz maximum + frequency. + - 32000Hz: sampling rate of audio quality a little below FM radio + bandwidth. + - 22050Hz: sampling rate of audio quality of AM radio. + + For more information see: http://wiki.audacityteam.org/wiki/Sample_Rates. + ''' + ) parser.add_argument( -'--update', -action='store_true', -help=""" -Update mkchromecast git repository. + '--screencast', + action='store_true', + default=False, + help=''' + Use this flag to cast your Desktop Google cast devices. It is only working + with ffmpeg. You may want to you use the --resolution option together with + this flag. -Example: - python mkchromecast.py --update + Examples: -This will execute for you: + python mkchromecast.py --video --screencast + ''' + ) - git pull --all - git fetch -p -""" -) +parser.add_argument( + '--seek', + type=str, + default=None, + help=''' + Option to seeking when casting video. The format to set the time is + HH:MM:SS. + + Example: + python mkchromecast.py --video -i "/path/to/file.mp4" --seek 00:23:00 + + ''' + ) + +parser.add_argument( + '--segment-time', + type=int, + default=None, + help=''' + Segmentate audio for improved live streaming when using ffmpeg. + + Example: + python mkchromecast.py --encoder-backend ffmpeg --segment-time 2 + + ''' + ) + +parser.add_argument( + '--source-url', + type=str, + default=None, + help=''' + This option allows you to pass any source URL to your Google Cast device. + You have to specify the codec with -c flag when using it. + + Example: + + Source URL, port and extension: + python mkchromecast.py --source-url http://192.99.131.205:8000/pvfm1.ogg -c ogg --control + + Source URL, no port, and extension: + python mkchromecast.py --source-url http://example.com/name.ogg -c ogg --control + + Source URL without extension: + python mkchromecast.py --source-url http://example.com/name -c aac --control + + Supported source URLs are: + + - http://url:port/name.mp3 + - http://url:port/name.ogg + - http://url:port/name.mp4 (use the aac codec) + - http://url:port/name.wav + - http://url:port/name.flac + + .m3u or .pls are not yet available. + ''' + ) parser.add_argument( -'-v', -'--version', -action='store_true', -help=''' -Show the version''' -) + '--subtitles', + type=str, + default=None, + help=''' + Set subtitles. + ''' + ) parser.add_argument( -'--video', -action='store_true', -default=False, -help=''' -Use this flag to cast video to your Google cast devices. It is only working -with ffmpeg. + '-t', + '--tray', + action='store_true', + help=''' + This option let you launch Mkchromecast as a systray menu (beta). + ''' + ) -Examples: +parser.add_argument( + '--tries', + type=int, + default=None, + help=''' + Limit the number of times the underlying socket associated with your + Chromecast objects will retry connecting + ''' + ) -Cast a file: - python mkchromecast.py --video -i "/path/to/file.mp4" +parser.add_argument( + '--update', + action='store_true', + help=""" + Update Mkchromecast git repository. -Cast from source-url: - python mkchromecast.py --source-url http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4 -c mp4 --control --video + Example: + python mkchromecast.py --update -Cast a youtube-url: - python mkchromecast.py -y https://www.youtube.com/watch\?v\=VuMBaAZn3II --video + This will execute for you: -''' -) + git pull --all + git fetch -p + """ + ) parser.add_argument( -'--volume', -action='store_true', -default=False, -help=''' -This option has been changed to --control. It will be deleted in following -releases. -''' -) + '-v', + '--version', + action='store_true', + help=''' + Show the version''' + ) parser.add_argument( -'-y', -'--youtube', -type=str, -default=None, -help=''' -Stream from Youtube URL. This option needs youtube-dl. + '--video', + action='store_true', + default=False, + help=''' + Use this flag to cast video to your Google cast devices. It is only working + with ffmpeg. + + Examples: + + Cast a file: + python mkchromecast.py --video -i "/path/to/file.mp4" -Example: - python mkchromecast.py -y https://www.youtube.com/watch?v=NVvAJhZVBTc + Cast from source-url: + python mkchromecast.py --source-url http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4 -c mp4 --control --video -As I don't own a Google Cast for TVs, I cannot test this correctly. But in -principle it should work. -''' -) + Cast a youtube-url: + python mkchromecast.py -y https://www.youtube.com/watch\?v\=VuMBaAZn3II --video + + ''' + ) +parser.add_argument( + '--volume', + action='store_true', + default=False, + help=''' + This option has been changed to --control. It will be deleted in following + releases. + ''' + ) + +parser.add_argument( + '-y', + '--youtube', + type=str, + default=None, + help=''' + Stream from sources supported by youtube-dl. This option needs + the youtube-dl package, and it also gives you access to all its + supported websites such as Dailymotion, LiveLeak, and Vimeo. + + For a comprehensive list, check: + http://rg3.github.io/youtube-dl/supportedsites.html. + + Example: + python mkchromecast.py -y https://www.youtube.com/watch?v=NVvAJhZVBTc + + Note that this is only working for websites running over https. + ''' + ) args = parser.parse_args() @@ -494,36 +556,38 @@ Assignment of args to variables """ tray = args.tray -if tray == True: +if tray is True: select_cc = True else: select_cc = args.select_cc debug = args.debug -if args.notifications == True: +if args.notifications is True: notifications = 'enabled' else: notifications = 'disabled' adevice = args.alsa_device -if debug == True: - print('ALSA device name:', adevice) +if debug is True: + print('ALSA device name: %s.' % adevice) discover = args.discover host = args.host input_file = args.input_file sourceurl = args.source_url subtitles = args.subtitles -reconnect = args.reconnect - +hijack = args.hijack ccname = args.name -if debug == True: - print('Google Cast name:', ccname) +port = args.port + + +if debug is True: + print('Google Cast name: %s.' % ccname) """ Reset """ -if args.reset == True: +if args.reset is True: if platform == 'Darwin': from mkchromecast.audio_devices import inputint, outputint inputint() @@ -536,14 +600,14 @@ """ Reboot """ -if args.reboot == True: +if args.reboot is True: print(colors.error('This option is not implemented yet.')) sys.exit(0) """ Not yet implemented """ -if args.config == True: +if args.config is True: print(colors.error('This option is not implemented yet.')) sys.exit(0) @@ -558,7 +622,7 @@ Update """ if args.update is True: - print(colors.warning('Updating mkchromecast')) + print(colors.warning('Updating Mkchromecast')) print(colors.important('git pull --all')) pull = subprocess.Popen( ['git', 'pull', '--all'], @@ -579,6 +643,8 @@ """ Check that encoders exist in the list """ +screencast = args.screencast + backends = [ 'node', 'ffmpeg', @@ -586,35 +652,35 @@ ] if platform == 'Darwin': backends.remove('avconv') -elif platform == 'Linux' and args.video == True: +elif platform == 'Linux' and args.video is True: pass else: backends.remove('node') backends.append('parec') backends.append('gstreamer') -if args.debug == True: +if args.debug is True: print('backends: ', backends) -if args.encoder_backend not in backends and args.encoder_backend != None: +if args.encoder_backend not in backends and args.encoder_backend is not None: print(colors.error('Supported backends are: ')) for backend in backends: - print('-',backend) + print('- %s.' % backend) sys.exit(0) if args.encoder_backend in backends: backend = args.encoder_backend -elif args.encoder_backend == None: #This is to define defaults - if platform == 'Linux' and args.video == False: +elif args.encoder_backend is None: # This is to define defaults + if platform == 'Linux' and args.video is False: args.encoder_backend = 'parec' backend = args.encoder_backend - if platform == 'Linux' and args.video == True: + if platform == 'Linux' and args.video is True: args.encoder_backend = 'ffmpeg' backend = args.encoder_backend - elif platform == 'Darwin' and args.video == True: + elif platform == 'Darwin' and args.video is True: args.encoder_backend = 'ffmpeg' backend = args.encoder_backend - elif platform == 'Darwin' and args.video == False: + elif platform == 'Darwin' and args.video is False: args.encoder_backend = 'node' backend = args.encoder_backend @@ -625,52 +691,60 @@ 'mp3', 'ogg', 'aac', + 'opus', 'wav', 'flac' ] -if backend == 'node' and args.codec != 'mp3' and sourceurl == None: +if backend == 'node' and args.codec != 'mp3' and sourceurl is None: rcodec = args.codec codec = 'mp3' -elif backend == 'node' and args.codec == 'mp3' and sourceurl == None: +elif backend == 'node' and args.codec == 'mp3' and sourceurl is None: rcodec = args.codec codec = 'mp3' -elif sourceurl != None: +elif sourceurl is not None: codec = args.codec else: rcodec = None if backend != 'node' and args.codec in codecs: codec = args.codec else: - print(colors.options('Selected audio codec: ')+ args.codec) + print(colors.options('Selected audio codec: %s.') % args.codec) print(colors.error('Supported audio codecs are: ')) for codec in codecs: - print('-', codec) + print('- %s.' % codec) sys.exit(0) + +""" +Command +""" +if args.command is not None and args.video is True: + safe_commands = ['ffmpeg', 'avconv'] + command = args.command.split(' ') + if command[0] not in safe_commands: + print(colors.error('Refusing to execute this.')) + sys.exit(0) +elif args.command is None and args.video is True: + command = args.command +elif args.command is not None and args.video is False: + print(colors.warning('The --command option only works for video.')) + """ Resolution """ -resolutions = [ - '480p', - '720p', - '1080p', - '2K', - 'UHD', - '4K' - ] -_resolutions = [r.lower() for r in resolutions] +resolutions = [r.lower() for r in resolutions.keys()] -if args.resolution == None: +if args.resolution is None: resolution = args.resolution -elif args.resolution.lower() in _resolutions: +elif args.resolution.lower() in resolutions: resolution = args.resolution.lower() else: print(colors.error('Supported resolutions are: ')) for res in resolutions: - if res != False: - print('-', res) + if res is not False: + print('- %s.' % res) sys.exit(0) """ @@ -680,6 +754,7 @@ 'mp3', 'ogg', 'aac', + 'opus', 'flac' ] @@ -691,17 +766,15 @@ else: bitrate = args.bit_rate else: - bitrate = None #When the codec does not require bitrate I set it to None + # When the codec does not require bitrate I set it to None + bitrate = None """ Chunk size """ if args.chunk_size <= 0: - print(colors.warning('Chunk size set to default: 1024.')) - chunk_size = 1024 -elif args.chunk_size < 512: - print(colors.warning('Chunk size not recommended. Using 512 instead.')) - chunk_size = 512 + chunk_size = 64 + print(colors.warning('Chunk size set to default: %s.' % chunk_size)) else: chunk_size = abs(args.chunk_size) @@ -712,6 +785,8 @@ if args.sample_rate < 22050: print(colors.error('The sample rate has to be greater than 22049.')) sys.exit(0) + elif args.codec == 'opus': + samplerate = 48000 else: samplerate = abs(args.sample_rate) elif args.sample_rate == 0: @@ -726,14 +801,19 @@ Segment time """ avoid = ['parec', 'node'] + if isinstance(args.segment_time, int) and backend not in avoid: - segmenttime = args.segment_time + segment_time = args.segment_time elif isinstance(args.segment_time, float) or backend in avoid: - segmenttime = None + segment_time = None else: - print(colors.warning('The segment time has to be an integer number')) - print(colors.warning('Set to default of 2 seconds')) - segmenttime = 2 + segment_time = None + +""" +Tries +""" + +tries = args.tries """ Video @@ -744,16 +824,27 @@ Volume """ control = args.control -if args.volume == True: #FIXME this has to be deleted in future releases. +if args.volume is True: # FIXME this has to be deleted in future releases. control = args.volume - print(colors.warning('The --volume flag is going to be renamed to --control.')) + print(colors.warning('The --volume flag is going to be renamed to \ + --control.')) """ Youtube URLs """ -if args.youtube != None: - if 'https' not in args.youtube: - print(colors.error('You need to provide a youtube URL')) +if args.youtube is not None: + if check_url(args.youtube) is False: + youtube_error = """ + You need to provide a URL that is supported by youtube-dl. + """ + message = """ + For a list of supported sources please visit: + https://rg3.github.io/youtube-dl/supportedsites.html + + Note that the URLs have to start with https. + """ + print(colors.error(youtube_error)) + print(message) sys.exit(0) else: youtubeurl = args.youtube @@ -761,19 +852,25 @@ else: youtubeurl = args.youtube + """ This is to write a PID file """ + + def writePidFile(): - if os.path.exists('/tmp/mkchromecast.pid') == True: #This is to verify that pickle tmp file exists - os.remove('/tmp/mkchromecast.pid') + # This is to verify that pickle tmp file exists + if os.path.exists('/tmp/mkchromecast.pid') is True: + os.remove('/tmp/mkchromecast.pid') pid = str(os.getpid()) f = open('/tmp/mkchromecast.pid', 'wb') pickle.dump(pid, f) f.close() return + def checkmktmp(): - if os.path.exists('/tmp/mkchromecast.tmp') == True: #This is to verify that pickle tmp file exists - os.remove('/tmp/mkchromecast.tmp') + # This is to verify that pickle tmp file exists + if os.path.exists('/tmp/mkchromecast.tmp') is True: + os.remove('/tmp/mkchromecast.tmp') return diff --git a/mkchromecast/audio.py b/mkchromecast/audio.py index a1c84e5d3..c571e0c81 100644 --- a/mkchromecast/audio.py +++ b/mkchromecast/audio.py @@ -7,9 +7,9 @@ """ import mkchromecast.__init__ -from mkchromecast.audio_devices import * +from mkchromecast.audio_devices import inputint, outputint +from mkchromecast.config import config_manager import mkchromecast.colors as colors -from mkchromecast.config import * import mkchromecast.messages as msg from mkchromecast.preferences import ConfigSectionMap import psutil @@ -18,7 +18,7 @@ import time from functools import partial from subprocess import Popen, PIPE -from flask import Flask, Response, request +from flask import Flask, Response import multiprocessing import threading import os @@ -30,7 +30,7 @@ try: import ConfigParser except ImportError: - import configparser as ConfigParser # This is for Python3 + import configparser as ConfigParser # This is for Python3 backends_dict = {} @@ -41,11 +41,17 @@ tray = mkchromecast.__init__.tray adevice = mkchromecast.__init__.adevice chunk_size = mkchromecast.__init__.chunk_size -segmenttime = mkchromecast.__init__.segmenttime +segment_time = mkchromecast.__init__.segment_time +port = mkchromecast.__init__.port + +frame_size = 32 * chunk_size +buffer_size = 2 * chunk_size**2 -if debug == True: - print(':::audio::: chunk_size: ', chunk_size) debug = mkchromecast.__init__.debug + +if debug is True: + print(':::audio::: chunk_size, frame_size, buffer_size: %s, %s, %s' + % (chunk_size, frame_size, buffer_size)) sourceurl = mkchromecast.__init__.sourceurl config = ConfigParser.RawConfigParser() configurations = config_manager() # Class from mkchromecast.config @@ -58,7 +64,7 @@ youtubeurl = None # This is to take the youtube URL -if youtubeurl != None: +if youtubeurl is not None: print(colors.options('The Youtube URL chosen:')+' '+youtubeurl) try: @@ -70,7 +76,7 @@ url_data = urllib.parse.urlparse(youtubeurl) query = urllib.parse.parse_qs(url_data.query) video = query['v'][0] - print(colors.options('Playing video:')+' '+video) + print(colors.options('Playing video:') + ' ' + video) command = [ 'youtube-dl', '-o', @@ -79,19 +85,19 @@ ] mtype = 'audio/mp4' else: - if os.path.exists(configf) and tray == True: + if os.path.exists(configf) and tray is True: configurations.chk_config() config.read(configf) backend = ConfigSectionMap('settings')['backend'] backends_dict[backend] = backend - codec= ConfigSectionMap('settings')['codec'] + codec = ConfigSectionMap('settings')['codec'] bitrate = ConfigSectionMap('settings')['bitrate'] - samplerate= ConfigSectionMap('settings')['samplerate'] + samplerate = ConfigSectionMap('settings')['samplerate'] adevice = ConfigSectionMap('settings')['alsadevice'] if adevice == 'None': adevice = None - if debug == True: - print(':::audio::: tray ='+str(tray)) + if debug is True: + print(':::audio::: tray = ' + str(tray)) print(colors.warning('Configuration file exists')) print(colors.warning('Using defaults set there')) print(backend, codec, bitrate, samplerate, adevice) @@ -107,41 +113,42 @@ 'avconv', 'parec' ] - if tray == True and backend in backends: - import os, getpass - import subprocess + if tray is True and backend in backends: + import os + import getpass USER = getpass.getuser() - PATH = './bin:./nodejs/bin:/Users/' \ - +str(USER) \ - +'/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/X11/bin:/usr/games:' \ - +os.environ['PATH'] + PATH = './bin:./nodejs/bin:/Users/' + \ + str(USER) + \ + '/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/X11/bin:/usr/games:' + os.environ['PATH'] iterate = PATH.split(':') for item in iterate: - verifyif = str(item+'/'+backend) - if os.path.exists(verifyif) == False: + verifyif = str(item + '/' + backend) + if os.path.exists(verifyif) is False: continue else: backends_dict[verifyif] = backend backend = verifyif - if debug == True: - print(':::audio::: Program '+str(backend)+' found in '+str(verifyif)) - print(':::audio::: backend dictionary '+str(backends_dict)) + if debug is True: + print(':::audio::: Program ' + str(backend) + + ' found in ' + str(verifyif)) + print(':::audio::: backend dictionary ' + + str(backends_dict)) if codec == 'mp3': - appendmtype = 'mpeg' + append_mtype = 'mpeg' else: - appendmtype = codec + append_mtype = codec - mtype = 'audio/'+appendmtype + mtype = 'audio/' + append_mtype - if sourceurl == None: - print(colors.options('Selected backend:')+' '+ backend) - print(colors.options('Selected audio codec:')+' '+ codec) + if sourceurl is None: + print(colors.options('Selected backend:') + ' ' + backend) + print(colors.options('Selected audio codec:') + ' ' + codec) if backend != 'node': if bitrate == '192': - bitrate = bitrate+'k' + bitrate = bitrate + 'k' msg.bitrate_default(bitrate) elif bitrate == 'None': msg.no_bitrate(codec) @@ -156,10 +163,10 @@ bitrate = '500' msg.maxbitrate(codec, bitrate) else: - bitrate = bitrate+'k' + bitrate = bitrate + 'k' - if sourceurl == None: - print(colors.options('Selected bitrate:')+' '+ bitrate) + if sourceurl is None: + print(colors.options('Selected bitrate:') + ' ' + bitrate) if samplerate == '44100': msg.samplerate_default(samplerate) @@ -168,6 +175,7 @@ 'mp3', 'ogg', 'aac', + 'opus', 'wav', 'flac' ] @@ -180,51 +188,58 @@ 'ogg' ] - if codec in codecs_sr and int(samplerate) > 22000 and int(samplerate) <= 27050: + if (codec in codecs_sr and int(samplerate) > 22000 and + int(samplerate) <= 27050): samplerate = '22050' if codec in no96k: msg.samplerate_no96(codec) else: msg.samplerate_info(codec) - if codec in codecs_sr and int(samplerate) > 27050 and int(samplerate) <= 32000: + elif (codec in codecs_sr and int(samplerate) > 27050 and + int(samplerate) <= 32000): samplerate = '32000' if codec in no96k: msg.samplerate_no96(codec) else: msg.samplerate_info(codec) - elif codec in codecs_sr and int(samplerate) > 32000 and int(samplerate) <= 36000: + elif (codec in codecs_sr and int(samplerate) > 32000 and + int(samplerate) <= 36000): samplerate = '32000' if codec in no96k: msg.samplerate_no96(codec) else: msg.samplerate_info(codec) - elif codec in codecs_sr and int(samplerate) > 36000 and int(samplerate) <= 43000: + elif (codec in codecs_sr and int(samplerate) > 36000 and + int(samplerate) <= 43000): samplerate = '44100' if codec in no96k: msg.samplerate_no96(codec) else: msg.samplerate_info(codec) - if sourceurl == None: - print(colors.warning('Sample rate has been set to default!')) + if sourceurl is None: + print(colors.warning('Sample rate set to default!')) - elif codec in codecs_sr and int(samplerate) > 43000 and int(samplerate) <= 72000: + elif (codec in codecs_sr and int(samplerate) > 43000 and + int(samplerate) <= 72000): samplerate = '48000' if codec in no96k: msg.samplerate_no96(codec) else: msg.samplerate_info(codec) - elif codec in codecs_sr and int(samplerate) > 72000 and int(samplerate) <= 90000: + elif (codec in codecs_sr and int(samplerate) > 72000 and + int(samplerate) <= 90000): samplerate = '88200' if codec in no96k: msg.samplerate_no96(codec) else: msg.samplerate_info(codec) - elif codec in codecs_sr and int(samplerate) > 90000 and int(samplerate) <= 96000: + elif (codec in codecs_sr and int(samplerate) > 90000 and + int(samplerate) <= 96000): if codec in no96k: samplerate = '48000' msg.samplerate_no96(codec) @@ -232,10 +247,11 @@ samplerate = '96000' msg.samplerate_info(codec) - if sourceurl == None: - print(colors.warning('Sample rate has been set to maximum!')) + if sourceurl is None: + print(colors.warning('Sample rate set to maximum!')) - elif codec in codecs_sr and int(samplerate) > 96000 and int(samplerate) <= 176000: + elif (codec in codecs_sr and int(samplerate) > 96000 and + int(samplerate) <= 176000): if codec in no96k: samplerate = '48000' msg.samplerate_no96(codec) @@ -243,8 +259,8 @@ samplerate = '176000' msg.samplerate_info(codec) - if sourceurl == None: - print(colors.warning('Sample rate has been set to maximum!')) + if sourceurl is None: + print(colors.warning('Sample rate set to maximum!')) elif codec in codecs_sr and int(samplerate) > 176000: if codec in no96k: @@ -254,38 +270,41 @@ samplerate = '192000' msg.samplerate_info(codec) - if sourceurl == None: - print(colors.warning('Sample rate has been set to maximum!')) + if sourceurl is None: + print(colors.warning('Sample rate set to maximum!')) - if sourceurl == None: - print(colors.options('Sample rate set to:')+' '+samplerate+'Hz') + if sourceurl is None: + print(colors.options('Sample rate set to:') + ' ' + + samplerate + 'Hz') """ We verify platform and other options """ platform = mkchromecast.__init__.platform - def debug_command(): # This function add some more flags to the ffmpeg command - command.insert(1, '-loglevel') # when user passes --debug option. + # This function add some more flags to the ffmpeg command + # when user passes --debug option. + def debug_command(): + command.insert(1, '-loglevel') command.insert(2, 'panic') return def modalsa(): command[command.index('pulse')] = 'alsa' - command[command.index('mkchromecast.monitor')] = adevice + command[command.index('Mkchromecast.monitor')] = adevice print (command) return - def set_segmenttime(): - string = [ '-f', 'segment', '-segment_time', str(segmenttime) ] + def set_segment_time(position): + string = ['-f', 'segment', '-segment_time', str(segment_time)] for element in string: - command.insert(-9, element) + command.insert(position, element) return """ MP3 192k """ - if codec == 'mp3': + if codec == 'mp3': if (platform == 'Linux' and backends_dict[backend] != 'parec' and backends_dict[backend] != 'gstreamer'): @@ -293,8 +312,10 @@ def set_segmenttime(): backend, '-ac', '2', '-ar', '44100', + '-frame_size', str(frame_size), + '-fragment_size', str(frame_size), '-f', 'pulse', - '-i', 'mkchromecast.monitor', + '-i', 'Mkchromecast.monitor', '-f', 'mp3', '-acodec', 'libmp3lame', '-ac', '2', @@ -302,14 +323,14 @@ def set_segmenttime(): '-b:a', bitrate, 'pipe:' ] - if adevice != None: + if adevice is not None: modalsa() - if segmenttime != None: - set_segmenttime() + if segment_time is not None: + set_segment_time(-11) elif (platform == 'Linux' and backends_dict[backend] == 'parec' or - backends_dict[backend] == 'gstreamer'): + backends_dict[backend] == 'gstreamer'): command = [ 'lame', '-b', bitrate[:-1], @@ -341,7 +362,7 @@ def set_segmenttime(): command.insert(3, 'device="'+adevice+'"') else: command.insert(2, 'pulsesrc') - command.insert(3, 'device="mkchromecast.monitor"') + command.insert(3, 'device="Mkchromecast.monitor"') """ else: command = [ @@ -355,21 +376,24 @@ def set_segmenttime(): '-b:a', bitrate, 'pipe:' ] - if segmenttime != None: - set_segmenttime() + + if segment_time is not None: + set_segment_time(-11) """ OGG 192k """ - if codec == 'ogg': + if codec == 'ogg': if (platform == 'Linux' and backends_dict[backend] != 'parec' and backends_dict[backend] != 'gstreamer'): command = [ backend, '-ac', '2', '-ar', '44100', + '-frame_size', str(frame_size), + '-fragment_size', str(frame_size), '-f', 'pulse', - '-i', 'mkchromecast.monitor', + '-i', 'Mkchromecast.monitor', '-f', 'ogg', '-acodec', 'libvorbis', '-ac', '2', @@ -377,11 +401,11 @@ def set_segmenttime(): '-b:a', bitrate, 'pipe:' ] - if adevice != None: + if adevice is not None: modalsa() - if segmenttime != None: - set_segmenttime() + if segment_time is not None: + set_segment_time(-11) elif (platform == 'Linux' and backends_dict[backend] == 'parec' or backends_dict[backend] == 'gstreamer'): @@ -411,14 +435,15 @@ def set_segmenttime(): 'oggmux', '!', 'filesink', 'location=/dev/stdout' - #gst-launch-1.0 pulsesrc device="mkchromecast.monitor" ! audioconvert ! audioresample ! vorbisenc ! oggmux ! filesink + #gst-launch-1.0 pulsesrc device="Mkchromecast.monitor" + ! audioconvert ! audioresample ! vorbisenc ! oggmux ! filesink ] if adevice != None: command.insert(1, 'alsasrc') command.insert(2, 'device="'+adevice+'"') else: command.insert(1, 'pulsesrc') - command.insert(2, 'device="mkchromecast.monitor"') + command.insert(2, 'device="Mkchromecast.monitor"') """ else: command = [ @@ -436,15 +461,17 @@ def set_segmenttime(): """ AAC > 128k for Stereo, Default sample rate: 44100kHz """ - if codec == 'aac': + if codec == 'aac': if (platform == 'Linux' and backends_dict[backend] != 'parec' and backends_dict[backend] != 'gstreamer'): command = [ backend, '-ac', '2', '-ar', '44100', + '-frame_size', str(frame_size), + '-fragment_size', str(frame_size), '-f', 'pulse', - '-i', 'mkchromecast.monitor', + '-i', 'Mkchromecast.monitor', '-f', 'adts', '-acodec', 'aac', '-ac', '2', @@ -453,7 +480,7 @@ def set_segmenttime(): '-cutoff', '18000', 'pipe:' ] - if adevice != None: + if adevice is not None: modalsa() elif (platform == 'Linux' and backends_dict[backend] == 'parec' or @@ -463,7 +490,7 @@ def set_segmenttime(): '-b', bitrate[:-1], '-X', '-P', - '-c','18000', + '-c', '18000', '-o', '-', '-' @@ -491,7 +518,7 @@ def set_segmenttime(): command.insert(3, 'device="'+adevice+'"') else: command.insert(2, 'pulsesrc') - command.insert(3, 'device="mkchromecast.monitor"') + command.insert(3, 'device="Mkchromecast.monitor"') """ else: command = [ @@ -505,37 +532,91 @@ def set_segmenttime(): '-b:a', bitrate, 'pipe:' ] - if segmenttime != None: - set_segmenttime() + + if segment_time is not None: + set_segment_time(-11) if platform == 'Darwin': cutoff = ['-cutoff', '18000'] for element in cutoff: command.insert(-1, element) + """ + OPUS + """ + if codec == 'opus': + if platform == 'Linux' and backends_dict[backend] != 'parec': + command = [ + backend, + '-ac', '2', + '-ar', '44100', + '-frame_size', str(frame_size), + '-fragment_size', str(frame_size), + '-f', 'pulse', + '-i', 'Mkchromecast.monitor', + '-f', 'opus', + '-acodec', 'libopus', + '-ac', '2', + '-ar', samplerate, + '-b:a', bitrate, + 'pipe:' + ] + if adevice is not None: + modalsa() + + if segment_time is not None: + set_segment_time(-11) + + elif (platform == 'Linux' and backends_dict[backend] == 'parec' or + backends_dict[backend] == 'gstreamer'): + command = [ + 'opusenc', + '-', + '--raw', + '--bitrate', bitrate[:-1], + '--raw-rate', samplerate, + '-' + ] + else: + command = [ + backend, + '-f', 'avfoundation', + '-i', ':Soundflower (2ch)', + '-f', 'opus', + '-acodec', 'libopus', + '-ac', '2', + '-ar', samplerate, + '-b:a', bitrate, + 'pipe:' + ] + if segment_time is not None: + set_segment_time(-11) """ WAV 24-Bit """ - if codec == 'wav': + if codec == 'wav': if platform == 'Linux' and backends_dict[backend] != 'parec': command = [ backend, '-ac', '2', '-ar', '44100', + '-frame_size', str(frame_size), + '-fragment_size', str(frame_size), '-f', 'pulse', - '-i', 'mkchromecast.monitor', + '-i', 'Mkchromecast.monitor', '-f', 'wav', '-acodec', 'pcm_s24le', '-ac', '2', '-ar', samplerate, 'pipe:' ] - if adevice != None: + + if adevice is not None: modalsa() - if segmenttime != None: - set_segmenttime() + if segment_time is not None: + set_segment_time(-9) elif (platform == 'Linux' and backends_dict[backend] == 'parec' or backends_dict[backend] == 'gstreamer'): @@ -565,20 +646,23 @@ def set_segmenttime(): '-ar', samplerate, 'pipe:' ] - if segmenttime != None: - set_segmenttime() + if segment_time is not None: + set_segment_time(-9) """ - FLAC 24-Bit (values taken from: https://trac.ffmpeg.org/wiki/Encode/HighQualityAudio) except for parec. + FLAC 24-Bit (values taken from: + https://trac.ffmpeg.org/wiki/Encode/HighQualityAudio) except for parec. """ - if codec == 'flac': + if codec == 'flac': if platform == 'Linux' and backends_dict[backend] != 'parec': command = [ backend, '-ac', '2', '-ar', '44100', + '-frame_size', str(frame_size), + '-fragment_size', str(frame_size), '-f', 'pulse', - '-i', 'mkchromecast.monitor', + '-i', 'Mkchromecast.monitor', '-f', 'flac', '-acodec', 'flac', '-ac', '2', @@ -586,11 +670,11 @@ def set_segmenttime(): '-b:a', bitrate, 'pipe:' ] - if adevice != None: + if adevice is not None: modalsa() - if segmenttime != None: - set_segmenttime() + if segment_time is not None: + set_segment_time(-11) elif (platform == 'Linux' and backends_dict[backend] == 'parec' or backends_dict[backend] == 'gstreamer'): @@ -617,18 +701,19 @@ def set_segmenttime(): '-b:a', bitrate, 'pipe:' ] - if segmenttime != None: - set_segmenttime() + if segment_time is not None: + set_segment_time(-11) verbose_backend = ['ffmpeg', 'avconv'] - if debug == False and backends_dict[backend] in verbose_backend: + if debug is False and backends_dict[backend] in verbose_backend: debug_command() app = Flask(__name__) -if debug == True: +if debug is True: print(':::audio::: command '+str(command)) + @app.route('/') def index(): return """ @@ -656,20 +741,20 @@ def shutdown(): return 'Server shutting down...' """ + + @app.route('/' + appendtourl) def stream(): - if (platform == 'Linux' - and bool(backends_dict) == True - and backends_dict[backend] == 'parec'): + if (platform == 'Linux' and bool(backends_dict) is True and + backends_dict[backend] == 'parec'): c_parec = [ backend, '--format=s16le', - '-d', 'mkchromecast.monitor' + '-d', 'Mkchromecast.monitor' ] parec = Popen(c_parec, stdout=PIPE) process = Popen(command, stdin=parec.stdout, stdout=PIPE, bufsize=-1) - elif (platform == 'Linux' and - bool(backends_dict) == True and + elif (platform == 'Linux' and bool(backends_dict) is True and backends_dict[backend] == 'gstreamer'): c_gst = [ 'gst-launch-1.0', @@ -679,19 +764,20 @@ def stream(): '!', 'filesink', 'location=/dev/stdout' ] - if adevice != None: + if adevice is not None: c_gst.insert(2, 'alsasrc') - c_gst.insert(3, 'device="'+adevice+'"') + c_gst.insert(3, 'device="' + adevice + '"') else: c_gst.insert(2, 'pulsesrc') - c_gst.insert(3, 'device="mkchromecast.monitor"') + c_gst.insert(3, 'device="Mkchromecast.monitor"') gst = Popen(c_gst, stdout=PIPE) process = Popen(command, stdin=gst.stdout, stdout=PIPE, bufsize=-1) else: process = Popen(command, stdout=PIPE, bufsize=-1) - read_chunk = partial(os.read, process.stdout.fileno(), chunk_size) + read_chunk = partial(os.read, process.stdout.fileno(), buffer_size) return Response(iter(read_chunk, b''), mimetype=mtype) + def start_app(): """Starting the streaming server. @@ -700,7 +786,8 @@ def start_app(): """ monitor_daemon = monitor() monitor_daemon.start() - app.run(host= '0.0.0.0', passthrough_errors=False) + app.run(host='0.0.0.0', port=port, passthrough_errors=False) + class multi_proc(object): # I launch ffmpeg in a different process def __init__(self): @@ -709,13 +796,14 @@ def __init__(self): def start(self): self.proc.start() -""" -I create a class to launch a thread in this process that monitors if main -application stops. -A normal running of mkchromecast will have 2 threads in the streaming process -when ffmpeg is used. -""" + + class monitor(object): + """ + I create a class to launch a thread in this process that monitors if main + application stops. A normal running of mkchromecast will have 2 threads in + the streaming process when ffmpeg is used. + """ def __init__(self): self.monitor_d = threading.Thread(target=monitor_daemon) self.monitor_d.daemon = True @@ -723,26 +811,29 @@ def __init__(self): def start(self): self.monitor_d.start() + def monitor_daemon(): f = open('/tmp/mkchromecast.pid', 'rb') - pidnumber=int(pickle.load(f)) - print(colors.options('PID of main process:')+' '+str(pidnumber)) + pidnumber = int(pickle.load(f)) + print(colors.options('PID of main process:') + ' ' + str(pidnumber)) - localpid=getpid() - print(colors.options('PID of streaming process:')+' '+str(localpid)) + localpid = getpid() + print(colors.options('PID of streaming process:') + ' ' + str(localpid)) - while psutil.pid_exists(localpid) == True: + while psutil.pid_exists(localpid) is True: try: time.sleep(0.5) - if psutil.pid_exists(pidnumber) == False: # With this I ensure that if the main app fails, everything - if platform == 'Darwin': # will get back to normal + # With this I ensure that if the main app fails, everything + # will get back to normal + if psutil.pid_exists(pidnumber) is False: + if platform == 'Darwin': inputint() outputint() else: from mkchromecast.pulseaudio import remove_sink remove_sink() parent = psutil.Process(localpid) - for child in parent.children(recursive=True): # or parent.children() for recursive=False + for child in parent.children(recursive=True): child.kill() parent.kill() except KeyboardInterrupt: @@ -755,6 +846,7 @@ def monitor_daemon(): print('OSError') sys.exit(0) + def main(): st = multi_proc() st.start() diff --git a/mkchromecast/audio_devices.py b/mkchromecast/audio_devices.py index e02f7998a..ff8787d2b 100644 --- a/mkchromecast/audio_devices.py +++ b/mkchromecast/audio_devices.py @@ -2,7 +2,6 @@ # This file is part of mkchromecast. -import socket import subprocess import os.path @@ -14,34 +13,38 @@ name() """ + def inputdev(): - if os.path.exists('./bin/audiodevice') == True: + if os.path.exists('./bin/audiodevice') is True: inputdevtosf2 = ['./bin/audiodevice input "Soundflower (2ch)"'] else: inputdevtosf2 = ['./audiodevice input "Soundflower (2ch)"'] subprocess.Popen(inputdevtosf2, shell=True) return + def outputdev(): - if os.path.exists('./bin/audiodevice') == True: + if os.path.exists('./bin/audiodevice') is True: outputdevtosf2 = ['./bin/audiodevice output "Soundflower (2ch)"'] else: outputdevtosf2 = ['./audiodevice output "Soundflower (2ch)"'] subprocess.Popen(outputdevtosf2, shell=True) return + def inputint(): - if os.path.exists('./bin/audiodevice') == True: - inputinttosf2 = ['./bin/audiodevice input internal'] + if os.path.exists('./bin/audiodevice') is True: + inputinttosf2 = ['./bin/audiodevice input "Internal Microphone"'] else: - inputinttosf2 = ['./audiodevice input internal'] + inputinttosf2 = ['./audiodevice input "Internal Microphone"'] subprocess.call(inputinttosf2, shell=True) return + def outputint(): - if os.path.exists('./bin/audiodevice') == True: - outputinttosf2 = ['./bin/audiodevice output internal'] + if os.path.exists('./bin/audiodevice') is True: + outputinttosf2 = ['./bin/audiodevice output "Internal Speakers"'] else: - outputinttosf2 = ['./audiodevice output internal'] + outputinttosf2 = ['./audiodevice output "Internal Speakers"'] subprocess.call(outputinttosf2, shell=True) return diff --git a/mkchromecast/cast.py b/mkchromecast/cast.py index a5ac551fb..99f7ba7ed 100644 --- a/mkchromecast/cast.py +++ b/mkchromecast/cast.py @@ -3,10 +3,9 @@ # This file is part of mkchromecast. from __future__ import print_function -from mkchromecast.__init__ import * -from mkchromecast.audio_devices import * +from mkchromecast.audio_devices import inputint, outputint import mkchromecast.colors as colors -from mkchromecast.config import * +from mkchromecast.__init__ import checkmktmp, args from mkchromecast.preferences import ConfigSectionMap from mkchromecast.utils import terminate from mkchromecast.pulseaudio import remove_sink @@ -17,7 +16,6 @@ import os.path import pickle import subprocess -import mkchromecast.colors as colors from threading import Thread """ @@ -26,7 +24,7 @@ try: import ConfigParser except ImportError: - import configparser as ConfigParser # This is for Python3 + import configparser as ConfigParser # This is for Python3 """ We verify that soco is installed to give Sonos support @@ -41,8 +39,9 @@ class casting(object): """Main casting class. """ - def __init__(self): # __init__ to call the self.ip - import mkchromecast.__init__ # This is to verify against some needed variables + def __init__(self): + # This is to verify against some needed variables + import mkchromecast.__init__ self.platform = mkchromecast.__init__.platform self.tray = mkchromecast.__init__.tray self.select_cc = mkchromecast.__init__.select_cc @@ -53,10 +52,13 @@ def __init__(self): # __init__ to call the self.ip self.discover = mkchromecast.__init__.discover self.host = mkchromecast.__init__.host self.ccname = mkchromecast.__init__.ccname - self.reconnect = mkchromecast.__init__.reconnect + self.hijack = mkchromecast.__init__.hijack + self.tries = mkchromecast.__init__.tries + self.port = mkchromecast.__init__.port + self.port = str(self.port) self.title = 'Mkchromecast v' + mkchromecast.__init__.__version__ - if self.host == None: + if self.host is None: if self.platform == 'Linux': self.getnetworkip() try: @@ -66,7 +68,7 @@ def __init__(self): # __init__ to call the self.ip else: try: self.ip = socket.gethostbyname(socket.gethostname()) - if self.debug == True: + if self.debug is True: print(':::cast::: sockets method', self.ip) except socket.gaierror: self.netifaces_ip() @@ -88,7 +90,7 @@ def getnetworkip(self): except socket.error: self.ip = '127.0.0.1' self.discovered_ip = s.getsockname()[0] - if self.debug == True: + if self.debug is True: print(':::cast::: sockets method', self.discovered_ip) def netifaces_ip(self): @@ -98,18 +100,21 @@ def netifaces_ip(self): if interface == 'lo': continue iface = netifaces.ifaddresses(interface).get(netifaces.AF_INET) - if iface != None and iface[0]['addr'] != '127.0.0.1': + if iface is not None and iface[0]['addr'] is not '127.0.0.1': for e in iface: self.discovered_ip = str(e['addr']) - if self.debug == True: - print(':::cast::: netifaces method', self.discovered_ip) + if self.debug is True: + print(':::cast::: netifaces method', + self.discovered_ip) def _get_chromecasts(self): # compatibility try: return list(pychromecast.get_chromecasts_as_dict().keys()) except AttributeError: - self._chromecasts_by_name = {c.name: c for c in pychromecast.get_chromecasts()} + self._chromecasts_by_name = {c.name: c for c in + pychromecast.get_chromecasts( + tries=self.tries)} return list(self._chromecasts_by_name.keys()) def _get_chromecast(self, name): @@ -123,102 +128,100 @@ def _get_chromecast(self, name): Cast processes """ def initialize_cast(self): - import mkchromecast.__init__ # This is to verify against some needed variables. - from pychromecast import socket_client # This fixes the `No handlers could be found for logger "pychromecast.socket_client` warning"`. - # See commit 18005ebd4c96faccd69757bf3d126eb145687e0d. + # This fixes the `No handlers could be found for logger + # "pychromecast.socket_client` warning"`. + # See commit 18005ebd4c96faccd69757bf3d126eb145687e0d. + from pychromecast import socket_client self.cclist = self._get_chromecasts() - self.cclist = [ [index, _, 'Gcast'] for index, _ in enumerate(self.cclist) ] + self.cclist = [[i, _, 'Gcast'] for i, _ in enumerate(self.cclist)] - if sonos == True: + if sonos is True: try: self.sonos_list = list(soco.discover()) - length = len(self.cclist) for self.index, device in enumerate(self.sonos_list): add_sonos = [self.index, device, 'Sonos'] self.cclist.append(add_sonos) except TypeError: pass - if self.debug == True: + if self.debug is True: print('self.cclist', self.cclist) - """ - This block was used for casting youtube with pychromecast, but it does not work - """ - """ - try: - self.youtubeurl = mkchromecast.__init__.youtubeurl - except AttributeError: - self.youtubeurl = None - """ - - if (len(self.cclist) != 0 and self.select_cc == False and - self.ccname == None): - if self.debug == True: + if (len(self.cclist) != 0 and self.select_cc is False and + self.ccname is None): + if self.debug is True: print('if len(self.cclist) != 0 and self.select_cc == False:') print(' ') - print(colors.important('List of Devices Available in your Network:')) - print(colors.important('------------------------------------------\n')) - print(colors.important('Index \tTypes \tFriendly Name ')) - print(colors.important('===== \t===== \t============= ')) + print(colors.important('List of Devices Available in Network:')) + print(colors.important('-------------------------------------\n')) + print(colors.important('Index Types Friendly Name ')) + print(colors.important('===== ===== ============= ')) self.availablecc() print(' ') - if self.discover == False: - print(colors.important('We will cast to first device in the list above!')) + if self.discover is False: + print(colors.important('Casting to first device shown above!')) + print(colors.important('Select devices by using the -s flag.')) print(' ') self.cast_to = self.cclist[0][1] - print(colors.success(self.cast_to)) + if self.cclist[0][2] == 'Sonos': + print(colors.success(self.cast_to.player_name)) + else: + print(colors.success(self.cast_to)) print(' ') - elif (len(self.cclist) != 0 and self.select_cc == True and - self.tray == False and self.ccname == None): - if self.debug == True: - print('elif len(self.cclist) != 0 and self.select_cc == True and self.tray == False:') - if os.path.exists('/tmp/mkchromecast.tmp') == False: + elif (len(self.cclist) != 0 and self.select_cc is True and + self.tray is False and self.ccname is None): + if self.debug is True: + print('elif len(self.cclist) != 0 and self.select_cc == True' + ' and self.tray == False:') + if os.path.exists('/tmp/mkchromecast.tmp') is False: self.tf = open('/tmp/mkchromecast.tmp', 'wb') print(' ') - print(colors.important('List of Devices Available in your Network:')) - print(colors.important('------------------------------------------\n')) - print(colors.important('Index \tTypes \tFriendly Name ')) - print(colors.important('===== \t===== \t============= ')) + print(colors.important('List of Devices Available in Network:')) + print(colors.important('-------------------------------------\n')) + print(colors.important('Index Types Friendly Name ')) + print(colors.important('===== ===== ============= ')) self.availablecc() else: - if self.debug == True: + if self.debug is True: print('else:') self.tf = open('/tmp/mkchromecast.tmp', 'rb') - self.index=pickle.load(self.tf) + self.index = pickle.load(self.tf) self.cast_to = self.cclist[int(self.index)] print(' ') - print(colors.options('Casting to:')+' '+colors.success(self.cast_to)) + print(colors.options('Casting to:') + ' ' + + colors.success(self.cast_to)) print(' ') - elif (len(self.cclist) != 0 and self.select_cc == True and - self.tray == True): - if self.debug == True: - print('elif len(self.cclist) != 0 and self.select_cc == True and self.tray == True:') - if os.path.exists('/tmp/mkchromecast.tmp') == False: + elif (len(self.cclist) != 0 and self.select_cc is True and + self.tray is True): + if self.debug is True: + print('elif len(self.cclist) != 0 and self.select_cc == True' + ' and self.tray == True:') + if os.path.exists('/tmp/mkchromecast.tmp') is False: self.tf = open('/tmp/mkchromecast.tmp', 'wb') print(' ') - print(colors.important('List of Devices Available in your Network:')) - print(colors.important('------------------------------------------\n')) - print(colors.important('Index \tTypes \tFriendly Name ')) - print(colors.important('===== \t===== \t============= ')) + print(colors.important('List of Devices Available in Network:')) + print(colors.important('-------------------------------------\n')) + print(colors.important('Index Types Friendly Name ')) + print(colors.important('===== ===== ============= ')) self.availablecc() else: - if self.debug == True: + if self.debug is True: print('else:') self.tf = open('/tmp/mkchromecast.tmp', 'rb') - self.cast_to=pickle.load(self.tf) + self.cast_to = pickle.load(self.tf) self.availablecc() print(' ') - print(colors.options('Casting to:')+' '+colors.success(self.cast_to)) + print(colors.options('Casting to:') + ' ' + + colors.success(self.cast_to)) print(' ') - elif len(self.cclist) == 0 and self.tray == False: - if self.debug == True: + elif len(self.cclist) == 0 and self.tray is False: + if self.debug is True: print('elif len(self.cclist) == 0 and self.tray == False:') print(colors.error('No devices found!')) - if self.platform == 'Linux' and self.adevice == None: + if self.platform == 'Linux' and self.adevice is None: remove_sink() elif self.platform == 'Darwin': inputint() @@ -226,13 +229,14 @@ def initialize_cast(self): terminate() exit() - elif len(self.cclist) == 0 and self.tray == True: + elif len(self.cclist) == 0 and self.tray is True: print(colors.error(':::Tray::: No devices found!')) self.availablecc = [] def sel_cc(self): print(' ') - print('Please, select the ' + colors.important('Index') + ' of the Google Cast device that you want to use:') + print('Please, select the ' + colors.important('Index') + + ' of the Google Cast device that you want to use:') self.index = input() def inp_cc(self): @@ -242,10 +246,12 @@ def inp_cc(self): self.tf.close() self.cast_to = self.cclist[int(self.index)][1] print(' ') - print(colors.options('Casting to:') + ' ' + colors.success(self.cast_to)) + print(colors.options('Casting to:') + ' ' + + colors.success(self.cast_to)) print(' ') except TypeError: - print(colors.options('Casting to:') + ' ' + colors.success(self.cast_to.player_name)) + print(colors.options('Casting to:') + ' ' + + colors.success(self.cast_to.player_name)) except IndexError: checkmktmp() self.tf = open('/tmp/mkchromecast.tmp', 'wb') @@ -254,31 +260,35 @@ def inp_cc(self): break def get_cc(self): - if self.debug == True: + if self.debug is True: print('def get_cc(self):') try: - if self.ccname != None: + if self.ccname is not None: self.cast_to = self.ccname self.cast = self._get_chromecast(self.cast_to) # Wait for cast device to be ready self.cast.wait() print(' ') - print(colors.important('Information about ') + ' ' + colors.success(self.cast_to)) + print(colors.important('Information about ') + ' ' + + colors.success(self.cast_to)) print(' ') print(self.cast.device) print(' ') - print(colors.important('Status of device ') + ' ' + colors.success(self.cast_to)) + print(colors.important('Status of device ') + ' ' + + colors.success(self.cast_to)) print(' ') print(self.cast.status) print(' ') except pychromecast.error.NoChromecastFoundError: - print(colors.error('No Chromecasts matching filter criteria were found!')) + print(colors.error('No Chromecasts matching filter criteria' + ' were found!')) if self.platform == 'Darwin': inputint() outputint() elif self.platform == 'Linux': remove_sink() - if self.tray == False: # In the case that the tray is used, we don't kill the application + # In the case that the tray is used, we don't kill the application + if self.tray is False: print(colors.error('Finishing the application...')) terminate() exit() @@ -290,82 +300,100 @@ def get_cc(self): pass def play_cast(self): - if self.debug == True: + if self.debug is True: print('def play_cast(self):') localip = self.ip try: - print(colors.options('The IP of ') - + colors.success(self.cast_to)+colors.options(' is:') - + ' ' + self.cast.host) + print(colors.options('The IP of ') + + colors.success(self.cast_to) + colors.options(' is:') + + ' ' + self.cast.host) except TypeError: - print(colors.options('The IP of ') - + colors.success(self.cast_to.player_name) - + colors.options(' is:') + ' ' + self.cast_to.ip_address) + print(colors.options('The IP of ') + + colors.success(self.cast_to.player_name) + + colors.options(' is:') + ' ' + self.cast_to.ip_address) except AttributeError: for _ in self.sonos_list: if self.cast_to in _.player_name: self.cast_to = _ - print(colors.options('The IP of ') - + colors.success(self.cast_to.player_name) - + colors.options(' is:') + ' ' + self.cast_to.ip_address) + print(colors.options('The IP of ') + + colors.success(self.cast_to.player_name) + + colors.options(' is:') + ' ' + self.cast_to.ip_address) - if self.host == None: + if self.host is None: print(colors.options('Your local IP is:') + ' ' + localip) else: - print(colors.options('Your manually entered local IP is:') + ' ' + localip) + print(colors.options('Your manually entered local IP is:') + + ' ' + localip) try: media_controller = self.cast.media_controller - if self.tray == True: + if self.tray is True: config = ConfigParser.RawConfigParser() - configurations = config_manager() # Class from mkchromecast.config + # Class from mkchromecast.config + from mkchromecast.config import config_manager + configurations = config_manager() configf = configurations.configf - if os.path.exists(configf) and self.tray == True: - print(tray) + if os.path.exists(configf) and self.tray is True: + print(self.tray) print(colors.warning('Configuration file exists')) print(colors.warning('Using defaults set there')) config.read(configf) self.backend = ConfigSectionMap('settings')['backend'] - if self.sourceurl != None: - if args.video == True: + if self.sourceurl is not None: + if args.video is True: import mkchromecast.video mtype = mkchromecast.video.mtype else: import mkchromecast.audio mtype = mkchromecast.audio.mtype print(' ') - print(colors.options('Casting from stream URL:') + ' ' + self.sourceurl) - print(colors.options('Using media type:') + ' ' + mtype) - media_controller.play_media(self.sourceurl, mtype, title=self.title) + print(colors.options('Casting from stream URL:') + ' ' + + self.sourceurl) + print(colors.options('Using media type:') + ' ' + + mtype) + media_controller.play_media( + self.sourceurl, + mtype, + title=self.title + ) elif (self.backend == 'ffmpeg' or self.backend == 'node' or self.backend == 'avconv' or self.backend == 'parec' or - self.backend == 'gstreamer' and self.sourceurl == None): - if args.video == True: + self.backend == 'gstreamer' and self.sourceurl is None): + if args.video is True: import mkchromecast.video mtype = mkchromecast.video.mtype else: import mkchromecast.audio mtype = mkchromecast.audio.mtype print(' ') - print(colors.options('The media type string used is:') + ' ' + mtype) - media_controller.play_media('http://' + localip + ':5000/stream', mtype, title=self.title) + print(colors.options('The media type string used is:') + + ' ' + mtype) + media_controller.play_media( + 'http://' + localip + ':' + self.port + '/stream', + mtype, + title=self.title + ) print(' ') print(colors.important('Cast media controller status')) print(' ') print(self.cast.status) print(' ') - if self.reconnect == True: - self.r = Thread(target=self.reconnect_cc) - self.r.daemon = True # This has to be set to True so that we catch KeyboardInterrupt. + if self.hijack is True: + self.r = Thread(target=self.hijack_cc) + # This has to be set to True so that we catch + # KeyboardInterrupt. + self.r.daemon = True self.r.start() except AttributeError: self.sonos = self.cast_to - self.sonos.play_uri('x-rincon-mp3radio://' + localip + ':5000/stream', title=self.title) - if self.tray == True: + self.sonos.play_uri('x-rincon-mp3radio://' + localip + + ':' + self.port + '/stream', + title=self.title) + if self.tray is True: self.cast = self.sonos def stop_cast(self): @@ -378,7 +406,8 @@ def volume_up(self): """ Increment volume by 0.1 unless it is already maxed. Returns the new volume. """ - print('Increasing volume... \n') + if self.debug is True: + print('Increasing volume... \n') try: volume = round(self.cast.status.volume_level, 1) return self.cast.set_volume(volume + 0.1) @@ -390,7 +419,8 @@ def volume_down(self): """ Decrement the volume by 0.1 unless it is already 0. Returns the new volume. """ - print('Decreasing volume... \n') + if self.debug is True: + print('Decreasing volume... \n') try: volume = round(self.cast.status.volume_level, 1) return self.cast.set_volume(volume - 0.1) @@ -426,7 +456,9 @@ def availablecc(self): device = device[1].player_name else: device = device[1] - print('%s \t%s \t%s' % (self.index, device[2], str(unicode(device).encode("utf-8")))) + print('%s \t%s \t%s' % + (self.index, device[2], + str(unicode(device).encode("utf-8")))) if types == 'Sonos': to_append = [self.index, device, types, device_ip] @@ -434,8 +466,8 @@ def availablecc(self): to_append = [self.index, device, types] self.availablecc.append(to_append) - def reconnect_cc(self): - """Dummy method to call _reconnect_cc_(). + def hijack_cc(self): + """Dummy method to call _hijack_cc_(). In the cast that the self.r thread is alive, we check that the chromecast is connected. If it is connected, we check again in @@ -443,26 +475,27 @@ def reconnect_cc(self): """ try: while self.r.is_alive(): - self._reconnect_cc_() - time.sleep(5) #FIXME: I think that this has to be set by users. + self._hijack_cc_() + # FIXME: I think that this has to be set by users. + time.sleep(5) except KeyboardInterrupt: self.stop_cast() - if platform == 'Darwin': + if self.platform == 'Darwin': inputint() outputint() - elif platform == 'Linux' and adevice == None: + elif self.platform == 'Linux' and self.adevice is None: remove_sink() terminate() - def _reconnect_cc_(self): - """Check if chromecast is disconnected and reconnect. + def _hijack_cc_(self): + """Check if chromecast is disconnected and hijack. This function checks if the chromecast is online. Then, if the display - name is different from "Default Media Receiver", it reconnects to the + name is different from "Default Media Receiver", it hijacks to the chromecast. """ ip = self.cast.host - if ping_chromecast(ip) == True: # The chromecast is online. + if ping_chromecast(ip) is True: # The chromecast is online. if str(self.cast.status.display_name) != "Default Media Receiver": self.ccname = self.cast_to self.get_cc() @@ -475,13 +508,14 @@ def _reconnect_cc_(self): except AttributeError: pass + def ping_chromecast(ip): """This function pings to hosts. Credits: http://stackoverflow.com/a/34455969/1995261 """ try: - output = subprocess.check_output("ping -c 1 " + ip, shell=True) + subprocess.check_output("ping -c 1 " + ip, shell=True) except: return False return True diff --git a/mkchromecast/colors.py b/mkchromecast/colors.py index 2f30e9d69..b01f3ce9d 100644 --- a/mkchromecast/colors.py +++ b/mkchromecast/colors.py @@ -8,6 +8,7 @@ except NameError: unicode = str # Python 3 + def color(text, **user_styles): styles = { # styles @@ -50,7 +51,8 @@ def color(text, **user_styles): try: color_text += styles[style] except KeyError: - raise KeyError('def color: parameter `{}` does not exist'.format(style)) + raise KeyError('def color: parameter `{}` does not exist' + .format(style)) color_text += text try: @@ -58,20 +60,26 @@ def color(text, **user_styles): except UnicodeEncodeError: return '\033[0m{}\033[0m'.format(unicode(color_text).encode("utf-8")) + def error(text): return color(text, bold=True, fg_red=True) + def important(text): return color(text, bold=False, fg_blue=True) + def options(text): return color(text, underline=True) + def bold(text): return color(text, bold=True) + def warning(text): return color(text, fg_orange=True) + def success(text): return color(text, fg_green=True) diff --git a/mkchromecast/config.py b/mkchromecast/config.py index 9414a88af..dda5c8682 100644 --- a/mkchromecast/config.py +++ b/mkchromecast/config.py @@ -4,16 +4,18 @@ """ Configparser is imported differently in Python3 """ -import mkchromecast.__init__ # This is to verify against some needed variables +import os +import getpass +import mkchromecast.__init__ try: import ConfigParser except ImportError: - import configparser as ConfigParser # This is for Python3 -import os, getpass + import configparser as ConfigParser # Python3 platform = mkchromecast.__init__.platform debug = mkchromecast.__init__.debug + class config_manager(object): def __init__(self): self.user = getpass.getuser() @@ -38,14 +40,16 @@ def __init__(self): # Writing our configuration file """ - Depeding the platform we create the configuration directory in different - locations. + Depeding the platform we create the configuration directory in + different locations. """ if platform == 'Darwin': - self.directory = '/Users/'+self.user+'/Library/Application Support/mkchromecast/' + self.directory = '/Users/' + self.user + \ + '/Library/Application Support/mkchromecast/' else: - self.directory = '/home/'+self.user+'/.config/mkchromecast/' #Linux - self.configf = self.directory+'mkchromecast.cfg' + self.directory = '/home/' + self.user + \ + '/.config/mkchromecast/' # Linux + self.configf = self.directory + 'mkchromecast.cfg' def config_defaults(self): """ @@ -105,16 +109,17 @@ def chk_config(self): try: e = ConfigSectionMap('settings')[str(e)] except KeyError: - if debug == True: - print(':::config::: the setting '+e+' is not correctly set. Defaults added.') + if debug is True: + print(':::config::: the setting %s is not correctly set. ' + 'Defaults added.' % e) self.config.set('settings', str(e), self.defaultconf[e]) with open(self.configf, 'w') as configfile: self.config.write(configfile) backend = ConfigSectionMap('settings')['backend'] - codec= ConfigSectionMap('settings')['codec'] + codec = ConfigSectionMap('settings')['codec'] bitrate = ConfigSectionMap('settings')['bitrate'] - samplerate= ConfigSectionMap('settings')['samplerate'] + samplerate = ConfigSectionMap('settings')['samplerate'] notifications = ConfigSectionMap('settings')['notifications'] colors = ConfigSectionMap('settings')['colors'] searchatlaunch = ConfigSectionMap('settings')['searchatlaunch'] @@ -123,7 +128,9 @@ def chk_config(self): codecs = [ 'mp3', 'ogg', - 'aac' + 'aac', + 'opus', + 'flac', ] if os.path.exists(self.configf): @@ -135,9 +142,11 @@ def chk_config(self): self.config.set('settings', 'codec', str(codec)) self.config.set('settings', 'bitrate', '192') self.config.set('settings', 'samplerate', str(samplerate)) - self.config.set('settings', 'notifications', str(notifications)) + self.config.set('settings', 'notifications', + str(notifications)) self.config.set('settings', 'colors', str(colors)) - self.config.set('settings', 'searchatlaunch', str(searchatlaunch)) + self.config.set('settings', 'searchatlaunch', + str(searchatlaunch)) self.config.set('settings', 'alsadevice', str(alsadevice)) with open(self.configf, 'w') as configfile: diff --git a/mkchromecast/messages.py b/mkchromecast/messages.py index a059ba169..e99c55d7b 100644 --- a/mkchromecast/messages.py +++ b/mkchromecast/messages.py @@ -6,58 +6,63 @@ sourceurl = mkchromecast.__init__.sourceurl -""" -Bitrate messages -""" + def bitrate_default(bitrate): - """Printing default bitrate message""" - if sourceurl == None: - print(colors.options('Default bitrate used:')+' '+ bitrate) + """Bitrate messages + Printing default bitrate message + """ + if sourceurl is None: + print(colors.options('Default bitrate used:') + ' ' + bitrate) return + def no_bitrate(codec): - if sourceurl == None: - print(colors.warning('The '+codec+' codec does not require the bitrate argument.')) + if sourceurl is None: + print(colors.warning('The ' + codec + + ' codec does not require the bitrate argument.')) return + def maxbitrate(codec, bitrate): - if sourceurl == None: - print(colors.warning('Maximum bitrate supported by '+codec+' is: '+bitrate+'k.')) - if codec == 'aac' and sourceurl == None: - print(colors.warning('At about 128-256k is already considered as "transparent" for '+codec+'.')) + if sourceurl is None: + print(colors.warning('Maximum bitrate supported by ' + codec + + ' is: ' + bitrate + 'k.')) + if codec == 'aac' and sourceurl is None: + print(colors.warning('At about 128-256k is already considered as ' + '"transparent" for ' + codec + '.')) print(colors.warning('You may try lossless audio coding formats.')) print(colors.warning('Bitrate has been set to maximum!')) return -""" -Sample rate messages -""" + def samplerate_default(samplerate): - """Printing default sample rate message""" - if sourceurl == None: - print(colors.options('Default sample rate used:')+' '+ samplerate+'Hz') + """Sample rate messages + Printing default sample rate message""" + if sourceurl is None: + print(colors.options('Default sample rate used:') + ' ' + + samplerate + 'Hz.') return + def samplerate_info(codec): """This prints warning when sample rates are set incorrectly""" - if sourceurl == None: - print(colors.warning('Sample rates supported by '+codec+' are: ' - +str(22050)+'Hz, ' - +str(32000)+'Hz, ' - +str(44100)+'Hz, ' - +str(48000)+'Hz ' - +str(96000)+'Hz or ' - +str(192000)+'Hz') - ) + if sourceurl is None: + print(colors.warning('Sample rates supported by ' + codec + ' are: ' + + str(22050) + 'Hz, ' + + str(32000) + 'Hz, ' + + str(44100) + 'Hz, ' + + str(48000) + 'Hz ' + + str(96000) + 'Hz or ' + + str(192000) + 'Hz.')) return + def samplerate_no96(codec): """This prints warning when sample rates are set incorrectly and no 96k""" - if sourceurl == None: - print(colors.warning('sample rates supported by '+codec+' are: ' - +str(22050)+'hz, ' - +str(32000)+'hz, ' - +str(44100)+'hz or, ' - +str(48000)+'hz') - ) + if sourceurl is None: + print(colors.warning('Sample rates supported by ' + codec + ' are: ' + + str(22050) + 'Hz, ' + + str(32000) + 'Hz, ' + + str(44100) + 'Hz or, ' + + str(48000) + 'Hz.')) return diff --git a/mkchromecast/node.py b/mkchromecast/node.py index e55cb821a..1c6981cbf 100644 --- a/mkchromecast/node.py +++ b/mkchromecast/node.py @@ -10,13 +10,12 @@ """ import mkchromecast.__init__ -from mkchromecast.audio_devices import * +from mkchromecast.audio_devices import inputint, outputint import mkchromecast.colors as colors -from mkchromecast.cast import * -from mkchromecast.config import * +from mkchromecast.cast import casting +from mkchromecast.config import config_manager import mkchromecast.messages as msg from mkchromecast.preferences import ConfigSectionMap -import argparse import subprocess import multiprocessing import time @@ -33,7 +32,8 @@ try: import ConfigParser except ImportError: - import configparser as ConfigParser # This is for Python3 + # This is for Python3 + import configparser as ConfigParser def streaming(): @@ -44,18 +44,19 @@ def streaming(): tray = mkchromecast.__init__.tray debug = mkchromecast.__init__.debug config = ConfigParser.RawConfigParser() - configurations = config_manager() # Class from mkchromecast.config + # Class from mkchromecast.config + configurations = config_manager() configf = configurations.configf - if os.path.exists(configf) and tray == True: + if os.path.exists(configf) and tray is True: configurations.chk_config() print(colors.warning('Configuration file exists')) print(colors.warning('Using defaults set there')) config.read(configf) backend = ConfigSectionMap('settings')['backend'] - rcodec= ConfigSectionMap('settings')['codec'] + rcodec = ConfigSectionMap('settings')['codec'] bitrate = ConfigSectionMap('settings')['bitrate'] - samplerate= ConfigSectionMap('settings')['samplerate'] + samplerate = ConfigSectionMap('settings')['samplerate'] notifications = ConfigSectionMap('settings')['notifications'] else: backend = mkchromecast.__init__.backend @@ -65,33 +66,38 @@ def streaming(): samplerate = str(mkchromecast.__init__.samplerate) notifications = mkchromecast.__init__.notifications - print(colors.options('Selected backend:')+' '+ backend) + print(colors.options('Selected backend:') + ' ' + backend) - if debug == True: - print(':::node::: variables', backend,rcodec,bitrate,samplerate,notifications) + if debug is True: + print(':::node::: variables %s, %s, %s, %s, %s' % + (backend, rcodec, bitrate, samplerate, notifications)) try: youtubeurl = mkchromecast.__init__.youtubeurl except AttributeError: youtubeurl = None - if youtubeurl == None: + if youtubeurl is None: if backend == 'node' and rcodec != 'mp3': - print(colors.warning('Codec '+rcodec+' is not supported by the node server!')) - print('Using '+codec+' as default.') + print(colors.warning('Codec ' + + rcodec + ' is not supported by the node server!')) + print('Using ' + codec + ' as default.') if backend == 'node': if int(bitrate) == 192: - print(colors.options('Default bitrate used:')+' '+bitrate+'k') - elif int(bitrate) > 320: - print(colors.warning('Maximum bitrate supported by '+codec+' is:')+' '+str(320)+'k') - bitrate = '320' + print(colors.options('Default bitrate used:') + + ' ' + bitrate + 'k.') + elif int(bitrate) > 500: + print(colors.warning('Maximum bitrate supported by ' + + codec + ' is:') + ' ' + str(500) + 'k.') + bitrate = '500' print(colors.warning('Bitrate has been set to maximum!')) else: - print(colors.options('Selected bitrate: ')+bitrate+'k') + print(colors.options('Selected bitrate: ') + bitrate + 'k.') if samplerate == '44100': - print(colors.options('Default sample rate used:')+' '+ samplerate+'Hz') + print(colors.options('Default sample rate used:') + + ' ' + samplerate + 'Hz.') else: codecs_sr = [ 'mp3', @@ -109,24 +115,30 @@ def streaming(): 'ogg' ] - if codec in codecs_sr and int(samplerate) > 22000 and int(samplerate) <= 27050: + if (codec in codecs_sr and int(samplerate) > 22000 and + int(samplerate) <= 27050): samplerate = '22050' msg.samplerate_no96(codec) - if codec in codecs_sr and int(samplerate) > 27050 and int(samplerate) <= 32000: + if (codec in codecs_sr and int(samplerate) > 27050 and + int(samplerate) <= 32000): samplerate = '32000' msg.samplerate_no96(codec) - elif codec in codecs_sr and int(samplerate) > 32000 and int(samplerate) <= 36000: + elif (codec in codecs_sr and int(samplerate) > 32000 and + int(samplerate) <= 36000): samplerate = '32000' msg.samplerate_no96(codec) - elif codec in codecs_sr and int(samplerate) > 36000 and int(samplerate) <= 43000: + elif (codec in codecs_sr and int(samplerate) > 36000 and + int(samplerate) <= 43000): samplerate = '44100' msg.samplerate_no96(codec) - print(colors.warning('Sample rate has been set to default!')) + print(colors.warning('Sample rate has been set to \ + default!')) - elif codec in codecs_sr and int(samplerate) > 43000 and int(samplerate) <= 72000: + elif (codec in codecs_sr and int(samplerate) > 43000 and + int(samplerate) <= 72000): samplerate = '48000' msg.samplerate_no96(codec) @@ -134,14 +146,16 @@ def streaming(): if codec in no96k: msg.samplerate_no96(codec) samplerate = '48000' - print(colors.warning('Sample rate has been set to maximum!')) + print(colors.warning('Sample rate has been set to \ + maximum!')) - print(colors.options('Sample rate set to:')+' '+samplerate+'Hz') + print(colors.options('Sample rate set to:') + + ' ' + samplerate + 'Hz.') """ Node section """ - if os.path.exists('./bin/node') == True: + if os.path.exists('./bin/node') is True: webcast = [ './bin/node', './nodejs/node_modules/webcast-osx-audio/bin/webcast.js', @@ -168,24 +182,27 @@ def streaming(): 'stream' ] p = subprocess.Popen(webcast) - if debug == True: - print(':::node::: node command', webcast) + if debug is True: + print(':::node::: node command: %s.' % webcast) f = open('/tmp/mkchromecast.pid', 'rb') - pidnumber=int(pickle.load(f)) - print(colors.options('PID of main process:')+' '+str(pidnumber)) + pidnumber = int(pickle.load(f)) + print(colors.options('PID of main process:') + ' ' + str(pidnumber)) - localpid=getpid() - print(colors.options('PID of streaming process:')+' '+str(localpid)) + localpid = getpid() + print(colors.options('PID of streaming process:') + ' ' + str(localpid)) while p.poll() is None: try: time.sleep(0.5) - if psutil.pid_exists(pidnumber) == False: # With this I ensure that if the main app fails, everything - inputint() # will get back to normal + # With this I ensure that if the main app fails, everything + # will get back to normal + if psutil.pid_exists(pidnumber) is False: + inputint() outputint() parent = psutil.Process(localpid) - for child in parent.children(recursive=True): # or parent.children() for recursive=False + # or parent.children() for recursive=False + for child in parent.children(recursive=True): child.kill() parent.kill() except KeyboardInterrupt: @@ -200,14 +217,16 @@ def streaming(): else: print(colors.warning('Reconnecting node streaming...')) if platform == 'Darwin' and notifications == 'enabled': - if os.path.exists('images/google.icns') == True: + if os.path.exists('images/google.icns') is True: noticon = 'images/google.icns' else: noticon = 'google.icns' - if debug == True: - print(':::node::: platform, tray, notifications', platform, tray, notifications) + if debug is True: + print(':::node::: platform, tray, notifications: %s, %s, %s.' + % (platform, tray, notifications)) - if platform == 'Darwin' and tray == True and notifications == 'enabled': + if (platform == 'Darwin' and tray is True and notifications == + 'enabled'): reconnecting = [ './notifier/terminal-notifier.app/Contents/MacOS/terminal-notifier', '-group', @@ -223,11 +242,13 @@ def streaming(): ] subprocess.Popen(reconnecting) - if debug == True: - print(':::node::: reconnecting notifier command', reconnecting) - relaunch(stream,recasting,kill) + if debug is True: + print(':::node::: reconnecting notifier command: %s.' + % reconnecting) + relaunch(stream, recasting, kill) return + class multi_proc(object): def __init__(self): self.proc = multiprocessing.Process(target=streaming) @@ -236,17 +257,20 @@ def __init__(self): def start(self): self.proc.start() + def kill(): - pid=getpid() + pid = getpid() os.kill(pid, signal.SIGTERM) return -def relaunch(func1,func2,func3): + +def relaunch(func1, func2, func3): func1() func2() func3() return + def recasting(): start = casting() start.initialize_cast() @@ -254,6 +278,7 @@ def recasting(): start.play_cast() return + def stream(): st = multi_proc() st.start() diff --git a/mkchromecast/preferences.py b/mkchromecast/preferences.py index 26bceb4bb..bcf580e08 100644 --- a/mkchromecast/preferences.py +++ b/mkchromecast/preferences.py @@ -3,12 +3,11 @@ # This file is part of mkchromecast. import sys -import mkchromecast.__init__ # This is to verify against some needed variables -from mkchromecast.config import * +import mkchromecast.__init__ +from mkchromecast.config import config_manager from mkchromecast.utils import is_installed import os import getpass -import subprocess import webbrowser """ @@ -21,14 +20,14 @@ USER = getpass.getuser() if platform == 'Darwin': - PATH ='./bin:./nodejs/bin:/Users/' + \ + PATH = './bin:./nodejs/bin:/Users/' + \ str(USER) + \ '/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/X11/bin:/usr/games:' + \ os.environ['PATH'] else: PATH = os.environ['PATH'] -if debug == True: +if debug is True: print('USER ='+str(USER)) print('PATH ='+str(PATH)) @@ -38,7 +37,8 @@ try: import ConfigParser except ImportError: - import configparser as ConfigParser # This is for Python3 + import configparser as ConfigParser # Python3 + def ConfigSectionMap(section): config = ConfigParser.RawConfigParser() @@ -53,13 +53,13 @@ def ConfigSectionMap(section): if dict1[option] == -1: DebugPrint('skip: %s' % option) except: - print('exception on %s!' % option) + print('Exception on %s!' % option) dict1[option] = None return dict1 -if tray == True: +if tray is True: from PyQt5.QtWidgets import (QWidget, QLabel, QComboBox, QApplication, - QPushButton, QLineEdit) + QPushButton, QLineEdit) from PyQt5 import QtCore class preferences(QWidget): @@ -67,14 +67,14 @@ def __init__(self, scale_factor): try: super().__init__() except TypeError: - super(self.__class__, self).__init__() #This is to port to python2 + super(self.__class__, self).__init__() # port to python2 self.scale_factor = scale_factor self.config = ConfigParser.RawConfigParser() - self.configurations = config_manager() # Class from mkchromecast.config + self.configurations = config_manager() self.configf = self.configurations.configf - if os.path.exists(self.configf) == False: - print('config does not exist') + if os.path.exists(self.configf) is False: + print('Config file does not exist!') self.configurations.config_defaults() self.read_defaults() self.initUI() @@ -106,22 +106,24 @@ def backend(self): self.backends = [] if platform == 'Darwin': for item in backends_supported: - if (is_installed(item, PATH, debug) == True - and item != 'avconv' and item !='gstreamer'): + if (is_installed(item, PATH, debug) is True and + item != 'avconv' and item != 'gstreamer'): self.backends.append(item) else: for item in backends_supported: - if (is_installed(item, PATH, debug) == True - and item != 'node' and item != 'gstreamer'): + if (is_installed(item, PATH, debug) is True and + item != 'node' and item != 'gstreamer'): self.backends.append(item) - elif (is_installed('gst-launch-1.0', PATH, debug) == True and - item == 'gstreamer'): # hardcoded gst-launch-1.0 for gstreamer + # hardcoded gst-launch-1.0 for gstreamer + elif (is_installed('gst-launch-1.0', PATH, debug) is + True and item == 'gstreamer'): self.backends.append(item) backendindex = self.backends.index(self.backendconf) self.backend = QLabel('Select Backend', self) - self.backend.move(20*self.scale_factor, 24*self.scale_factor) + self.backend.move(20 * self.scale_factor, 24 * self.scale_factor) self.qcbackend = QComboBox(self) - self.qcbackend.move(180*self.scale_factor, 20*self.scale_factor) + self.qcbackend.move(180 * self.scale_factor, + 20 * self.scale_factor) self.qcbackend.setMinimumContentsLength(7) for item in self.backends: self.qcbackend.addItem(item) @@ -146,10 +148,10 @@ def codec(self): 'wav', 'flac' ] - if debug == True: + if debug is True: print(self.codecs) codecindex = self.codecs.index(self.codecconf) - self.qccodec.move(180*self.scale_factor, 54*self.scale_factor) + self.qccodec.move(180 * self.scale_factor, 54 * self.scale_factor) self.qccodec.setMinimumContentsLength(7) for item in self.codecs: self.qccodec.addItem(item) @@ -164,7 +166,8 @@ def bitrate(self): self.bitrate.move(20 * self.scale_factor, 88 * self.scale_factor) self.qcbitrate = QComboBox(self) self.qcbitrate.clear() - self.qcbitrate.move(180 * self.scale_factor, 88 * self.scale_factor) + self.qcbitrate.move(180 * self.scale_factor, + 88 * self.scale_factor) self.qcbitrate.setMinimumContentsLength(7) if self.codecconf == 'wav': self.bitrates = ['None'] @@ -201,9 +204,11 @@ def samplerates(self): ] sampleratesindex = self.samplerates.index(self.samplerateconf) self.samplerate = QLabel('Sample Rate (Hz)', self) - self.samplerate.move(20*self.scale_factor, 120*self.scale_factor) + self.samplerate.move(20 * self.scale_factor, + 120 * self.scale_factor) self.qcsamplerate = QComboBox(self) - self.qcsamplerate.move(180*self.scale_factor, 120*self.scale_factor) + self.qcsamplerate.move(180 * self.scale_factor, + 120 * self.scale_factor) self.qcsamplerate.setMinimumContentsLength(7) for item in self.samplerates: self.qcsamplerate.addItem(item) @@ -221,9 +226,11 @@ def iconcolors(self): ] colorsindex = self.colors_list.index(self.searchcolorsconf) self.colors = QLabel('Icon Colors', self) - self.colors.move(20*self.scale_factor, 152*self.scale_factor) + self.colors.move(20 * self.scale_factor, + 152 * self.scale_factor) self.qccolors = QComboBox(self) - self.qccolors.move(180*self.scale_factor, 152*self.scale_factor) + self.qccolors.move(180 * self.scale_factor, + 152 * self.scale_factor) self.qccolors.setMinimumContentsLength(7) for item in self.colors_list: self.qccolors.addItem(item) @@ -238,11 +245,13 @@ def notifications(self): 'enabled', 'disabled' ] - notindex = self.notifications_list.index(self.notificationsconf) + notindex = self.notifications_list.index(self.notifconf) self.notifications = QLabel('Notifications', self) - self.notifications.move(20*self.scale_factor, 184*self.scale_factor) + self.notifications.move(20 * self.scale_factor, + 184 * self.scale_factor) self.qcnotifications = QComboBox(self) - self.qcnotifications.move(180*self.scale_factor, 184*self.scale_factor) + self.qcnotifications.move(180 * self.scale_factor, + 184 * self.scale_factor) self.qcnotifications.setMinimumContentsLength(7) for item in self.notifications_list: self.qcnotifications.addItem(item) @@ -257,11 +266,13 @@ def searchatlaunch(self): 'enabled', 'disabled' ] - launchindex = self.atlaunch_list.index(self.searchatlaunchconf) + launchindex = self.atlaunch_list.index(self.satlaunchconf) self.atlaunch = QLabel('Search At Launch', self) - self.atlaunch.move(20*self.scale_factor, 214*self.scale_factor) + self.atlaunch.move(20 * self.scale_factor, + 214 * self.scale_factor) self.qcatlaunch = QComboBox(self) - self.qcatlaunch.move(180*self.scale_factor, 214*self.scale_factor) + self.qcatlaunch.move(180 * self.scale_factor, + 214 * self.scale_factor) self.qcatlaunch.setMinimumContentsLength(7) for item in self.atlaunch_list: self.qcatlaunch.addItem(item) @@ -273,12 +284,14 @@ def alsadevice(self): Set the ALSA Device """ self.alsadevice = QLabel('ALSA Device', self) - self.alsadevice.move(20*self.scale_factor, 244*self.scale_factor) + self.alsadevice.move(20 * self.scale_factor, + 244 * self.scale_factor) self.qle = QLineEdit(self) - self.qle.move(179*self.scale_factor, 244*self.scale_factor) + self.qle.move(179 * self.scale_factor, + 244 * self.scale_factor) self.qle.setFixedWidth(84*self.scale_factor) self.read_defaults() - if self.alsadeviceconf != None: + if self.alsadeviceconf is not None: self.qle.setText(self.alsadeviceconf) self.qle.textChanged[str].connect(self.onActivatedalsadevice) @@ -287,27 +300,36 @@ def buttons(self): Buttons """ resetbtn = QPushButton("Reset Settings", self) - resetbtn.move(10*self.scale_factor, 274*self.scale_factor) + resetbtn.move(10 * self.scale_factor, 274 * self.scale_factor) resetbtn.clicked.connect(self.reset_configuration) faqbtn = QPushButton("FAQ", self) - faqbtn.move(138*self.scale_factor, 274*self.scale_factor) + faqbtn.move(138 * self.scale_factor, 274 * self.scale_factor) faqbtn.clicked.connect(lambda: webbrowser.open('https://github.com/muammar/mkchromecast/wiki/FAQ')) donbtn = QPushButton("Donate :)", self) - donbtn.move(204*self.scale_factor, 274*self.scale_factor) + donbtn.move(204 * self.scale_factor, 274 * self.scale_factor) donbtn.clicked.connect(lambda: webbrowser.open('https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=RZLF7TDCAXT9Q&lc=US&item_name=mkchromecast¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted')) def window(self): """ Geometry and window's title """ - self.setGeometry(300*self.scale_factor, 300*self.scale_factor, 300*self.scale_factor, 200*self.scale_factor) + self.setGeometry(300 * self.scale_factor, + 300 * self.scale_factor, + 300 * self.scale_factor, + 200 * self.scale_factor) if platform == 'Darwin': - self.setFixedSize(310*self.scale_factor, 320*self.scale_factor) #This is to fix the size of the window + # This is to fix the size of the window + self.setFixedSize(310 * self.scale_factor, + 320 * self.scale_factor) else: - self.setFixedSize(282*self.scale_factor, 320*self.scale_factor) #This is to fix the size of the window - self.setWindowFlags(QtCore.Qt.WindowCloseButtonHint | QtCore.Qt.WindowMinimizeButtonHint | QtCore.Qt.WindowStaysOnTopHint) + # This is to fix the size of the window + self.setFixedSize(282 * self.scale_factor, + 320 * self.scale_factor) + self.setWindowFlags(QtCore.Qt.WindowCloseButtonHint | + QtCore.Qt.WindowMinimizeButtonHint | + QtCore.Qt.WindowStaysOnTopHint) self.setWindowTitle('Mkchromecast Preferences') """ @@ -339,8 +361,8 @@ def reset_indexes(self): self.qcbitrate.addItem(item) sampleratesindex = self.samplerates.index(self.samplerateconf) colorsindex = self.colors_list.index(self.searchcolorsconf) - notindex = self.notifications_list.index(self.notificationsconf) - launchindex = self.atlaunch_list.index(self.searchatlaunchconf) + notindex = self.notifications_list.index(self.notifconf) + launchindex = self.atlaunch_list.index(self.satlaunchconf) self.qcbackend.setCurrentIndex(backendindex) self.qccodec.setCurrentIndex(codecindex) self.qcbitrate.setCurrentIndex(bitrateindex) @@ -368,10 +390,10 @@ def onActivatedbk(self, text): 'wav', 'flac' ] - if debug == True: - print(codecs) + if debug is True: + print('Codecs: %s.' % codecs) codecindex = codecs.index(self.codecconf) - self.qccodec.move(180*self.scale_factor, 54*self.scale_factor) + self.qccodec.move(180 * self.scale_factor, 54 * self.scale_factor) self.qccodec.setMinimumContentsLength(7) for item in codecs: self.qccodec.addItem(item) @@ -400,7 +422,8 @@ def onActivatedcc(self, text): '500' ] bitrateindex = bitrates.index(self.bitrateconf) - self.qcbitrate.move(180*self.scale_factor, 88*self.scale_factor) + self.qcbitrate.move(180 * self.scale_factor, + 88 * self.scale_factor) for item in bitrates: self.qcbitrate.addItem(item) self.qcbitrate.setCurrentIndex(bitrateindex) @@ -455,15 +478,15 @@ def read_defaults(self): self.codecconf = ConfigSectionMap('settings')['codec'] self.bitrateconf = ConfigSectionMap('settings')['bitrate'] self.samplerateconf = ConfigSectionMap('settings')['samplerate'] - self.notificationsconf = ConfigSectionMap('settings')['notifications'] + self.notifconf = ConfigSectionMap('settings')['notifications'] self.searchcolorsconf = ConfigSectionMap('settings')['colors'] - self.searchatlaunchconf = ConfigSectionMap('settings')['searchatlaunch'] + self.satlaunchconf = ConfigSectionMap('settings')['searchatlaunch'] self.alsadeviceconf = ConfigSectionMap('settings')['alsadevice'] - if debug == True: - print(self.backendconf, self.codecconf, self.bitrateconf, \ - self.samplerateconf, self.notificationsconf, \ - self.searchatlaunchconf, self.searchcolorsconf, \ - self.alsadeviceconf) + if debug is True: + print(self.backendconf, self.codecconf, self.bitrateconf, + self.samplerateconf, self.notifconf, + self.satlaunchconf, self.searchcolorsconf, + self.alsadeviceconf) def write_config(self): """This method writes to configfile""" diff --git a/mkchromecast/pulseaudio.py b/mkchromecast/pulseaudio.py index 6fc875d20..7b37d35bb 100644 --- a/mkchromecast/pulseaudio.py +++ b/mkchromecast/pulseaudio.py @@ -5,21 +5,22 @@ import subprocess import time + def create_sink(): - sink_name = 'mkchromecast' + sink_name = 'Mkchromecast' create_sink = [ 'pactl', 'load-module', 'module-null-sink', - 'sink_name='+sink_name + 'sink_name=' + sink_name ] rename_sink = [ 'pacmd', 'update-sink-proplist', sink_name, - 'device.description='+sink_name + 'device.description=' + sink_name ] cs = subprocess.Popen( @@ -39,6 +40,7 @@ def create_sink(): rsoutput, rserror = rs.communicate() return + def remove_sink(): remove_sink = [ 'pactl', @@ -54,6 +56,7 @@ def remove_sink(): rmsoutput, rmserror = rms.communicate() return + def check_sink(): check_sink = [ 'pacmd', @@ -67,12 +70,12 @@ def check_sink(): chkoutput, chkerror = chk.communicate() try: - if 'mkchromecast' in chkoutput: + if 'Mkchromecast' in chkoutput: return True else: return False except TypeError: - if 'mkchromecast' in chkoutput.decode('utf-8'): + if 'Mkchromecast' in chkoutput.decode('utf-8'): return True else: return False diff --git a/mkchromecast/resolution.py b/mkchromecast/resolution.py new file mode 100644 index 000000000..fb01c9280 --- /dev/null +++ b/mkchromecast/resolution.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python + +# This file is part of mkchromecast. + +resolutions = { + '480p': ('scale-854:-1', '854x480:'), + '720p': ('scale=1280:-1', '1280x720'), + '1366x768': ('scale=1366x768', '1366x768'), + '1080p': ('scale=1920x1080', '1920x1080'), + '2k': ('scale=2048x1148', '2048x1148'), + 'uhd': ('scale=3840x2160', '3840x2160'), + '4k': ('scale=4096:-1', '4096x2160') + } + + +def resolution(res, screencast): + res = resolutions[res.lower()] + if not screencast: + return ['-vf', res[0]] + else: + return res[1] diff --git a/mkchromecast/systray.py b/mkchromecast/systray.py index 483456bb8..72d14e7d2 100644 --- a/mkchromecast/systray.py +++ b/mkchromecast/systray.py @@ -4,36 +4,36 @@ # brew install pyqt5 --with-python --without-python3 from __future__ import division -import mkchromecast.__init__ # This is to verify against some needed variables -from mkchromecast.audio_devices import * -from mkchromecast.cast import * -from mkchromecast.config import * +import mkchromecast.__init__ +from mkchromecast.audio_devices import inputint, outputint +from mkchromecast.cast import casting +from mkchromecast.config import config_manager from mkchromecast.preferences import ConfigSectionMap -from mkchromecast.node import * import mkchromecast.preferences -from mkchromecast.pulseaudio import * +import mkchromecast.colors as colors +from mkchromecast.pulseaudio import remove_sink +from mkchromecast.utils import del_tmp import mkchromecast.tray_threading from PyQt5 import QtCore, QtGui, QtWidgets -from PyQt5.QtCore import (QThread, QObject, pyqtSignal, pyqtSlot, Qt) -from PyQt5.QtWidgets import (QWidget, QSlider, QLabel, QApplication, - QMessageBox, QMainWindow) -from PyQt5.QtGui import QPixmap +from PyQt5.QtCore import QThread, Qt +from PyQt5.QtWidgets import QWidget, QMessageBox import pychromecast +import socket from pychromecast.dial import reboot import signal import os.path import psutil import pickle import subprocess -import threading from os import getpid +import sys """ Configparser is imported differently in Python3 """ try: import ConfigParser except ImportError: - import configparser as ConfigParser # This is for Python3 + import configparser as ConfigParser """ urllib is imported differently in Python3 @@ -46,6 +46,7 @@ platform = mkchromecast.__init__.platform debug = mkchromecast.__init__.debug + class menubar(QtWidgets.QMainWindow): def __init__(self): self.cc = casting() @@ -57,7 +58,7 @@ def __init__(self): self.read_config() """ - These dictionaries are used to set the icons' colors + These dictionaries are used to set icons' colors """ self.google = { 'black': 'google', @@ -120,44 +121,46 @@ def __init__(self): else: self.scale_factor = 1 - if debug == True: + if debug is True: print(':::systray::: Screen resolution: ', self.width, self.height) - self.app.setQuitOnLastWindowClosed(False) # This avoid the QMessageBox to close parent processes. + # This avoid the QMessageBox to close parent processes. + self.app.setQuitOnLastWindowClosed(False) if hasattr(QtCore.Qt, 'AA_UseHighDpiPixmaps'): self.app.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps) - if debug == True: + if debug is True: print(':::systray::: High-DPI screen detected...') self.w = QWidget() - if os.path.exists('images/'+self.google[self.colors]+'.icns') == True: # This is useful when launching from git repo + # This is useful when launching from git repo + if os.path.exists('images/' + + self.google[self.colors] + '.icns') is True: self.icon = QtGui.QIcon() if platform == 'Darwin': self.icon.addFile( - 'images/' - + self.google[self.colors] - + '.icns' + 'images/' + + self.google[self.colors] + + '.icns' ) else: self.icon.addFile( - 'images/' - + self.google[self.colors] - + '.png' + 'images/' + + self.google[self.colors] + + '.png' ) - else: # This is useful for applications + else: self.icon = QtGui.QIcon() if platform == 'Linux': self.icon.addFile( - '/usr/share/mkchromecast/images/' - + self.google[self.colors] - + '.png' + '/usr/share/mkchromecast/images/' + + self.google[self.colors] + + '.png' ) else: - self.icon.addFile( - self.google[self.colors] - + '.icns') - super(QtWidgets.QMainWindow,self).__init__() + self.icon.addFile(self.google[self.colors] + + '.icns') + super(QtWidgets.QMainWindow, self).__init__() self.createUI() def createUI(self): @@ -184,7 +187,7 @@ def createUI(self): """ if self.searchatlaunch == 'enabled': self.search_cast() - self.app.exec_() #We start showing the system tray + self.app.exec_() # We start showing the system tray def read_config(self): """ @@ -199,19 +202,21 @@ def read_config(self): print(colors.warning('Using defaults set there')) config.read(configf) self.notifications = ConfigSectionMap('settings')['notifications'] - self.searchatlaunch = ConfigSectionMap('settings')['searchatlaunch'] + self.searchatlaunch = ConfigSectionMap('settings')[ + 'searchatlaunch'] self.colors = ConfigSectionMap('settings')['colors'] else: self.notifications = 'disabled' self.searchatlaunch = 'disabled' - self.colors= 'black' - if debug == True: + self.colors = 'black' + if debug is True: print(':::systray::: self.notifications '+self.notifications) print(':::systray::: self.searchatlaunch '+self.searchatlaunch) print(':::systray::: self.colors '+self.colors) def search_menu(self): - self.SearchAction = self.menu.addAction('Search For Media Streaming Devices') + self.SearchAction = self.menu.addAction('Search For Media ' + 'Streaming Devices') self.SearchAction.triggered.connect(self.search_cast) def stop_menu(self): @@ -226,7 +231,7 @@ def separator_menu(self): self.menu.addSeparator() def populating_menu(self): - if self.SearchAction.triggered.connect == True: + if self.SearchAction.triggered.connect is True: self.cast_list() def resetaudio_menu(self): @@ -262,132 +267,147 @@ def onIntReady(self, availablecc): self.availablecc = availablecc self.cast_list() - def search_cast(self): - self.read_config() + def set_icon_working(self): + """docstring for fnamicon_working""" if self.notifications == 'enabled': self.search_notification() - if os.path.exists('images/'+self.google_working[self.colors]+'.icns') == True: + if os.path.exists('images/' + + self.google_working[self.colors]+'.icns') is True: if platform == 'Darwin': self.tray.setIcon( QtGui.QIcon( - 'images/' - + self.google_working[self.colors] - + '.icns' + 'images/' + + self.google_working[self.colors] + + '.icns' ) ) else: self.tray.setIcon( QtGui.QIcon( - 'images/' - + self.google_working[self.colors] - + '.png' + 'images/' + + self.google_working[self.colors] + + '.png' ) ) else: if platform == 'Linux': self.tray.setIcon( QtGui.QIcon( - '/usr/share/mkchromecast/images/' - + self.google_working[self.colors] - + '.png' + '/usr/share/mkchromecast/images/' + + self.google_working[self.colors] + + '.png' ) ) else: self.tray.setIcon( QtGui.QIcon( - self.google_working[self.colors] - + '.icns' + self.google_working[self.colors] + + '.icns' ) ) - """ - This catches the error caused by an empty .tmp file - """ - if os.path.exists('/tmp/mkchromecast.tmp') == True: - try: - self.tf = open('/tmp/mkchromecast.tmp', 'rb') - self.index=pickle.load(self.tf) - except EOFError: - os.remove('/tmp/mkchromecast.tmp') - - if self.stopped == True and os.path.exists('/tmp/mkchromecast.tmp') == True: - os.remove('/tmp/mkchromecast.tmp') - - self.thread.start() + def set_icon_idle(self): + """docstring for icon_idle""" + if os.path.exists('images/'+self.google[self.colors]+'.icns') is True: + if platform == 'Darwin': + self.tray.setIcon( + QtGui.QIcon( + 'images/' + + self.google[self.colors] + + '.icns' + ) + ) + else: + self.tray.setIcon( + QtGui.QIcon( + 'images/' + + self.google[self.colors] + + '.png' + ) + ) + else: + if platform == 'Linux': + self.tray.setIcon( + QtGui.QIcon( + '/usr/share/mkchromecast/images/' + + self.google[self.colors] + + '.png' + ) + ) + else: + self.tray.setIcon( + QtGui.QIcon( + self.google[self.colors] + + '.icns' + ) + ) - def cast_list(self): - if os.path.exists('images/'+self.google[self.colors]+'.icns') == True: + def set_icon_nodev(self): + """docstring for set_ic""" + if os.path.exists('images/' + + self.google_nodev[self.colors]+'.icns') is True: if platform == 'Darwin': self.tray.setIcon( QtGui.QIcon( - 'images/' - + self.google[self.colors] - + '.icns' + 'images/' + + self.google_nodev[self.colors] + + '.icns' ) ) else: self.tray.setIcon( QtGui.QIcon( - 'images/' - + self.google[self.colors] - + '.png' + 'images/' + + self.google_nodev[self.colors] + + '.png' ) ) else: if platform == 'Linux': self.tray.setIcon( QtGui.QIcon( - '/usr/share/mkchromecast/images/' - + self.google[self.colors] - + '.png' + '/usr/share/mkchromecast/images/' + + self.google_nodev[self.colors] + + '.png' ) ) else: self.tray.setIcon( QtGui.QIcon( - self.google[self.colors] - + '.icns' + self.google_nodev[self.colors] + + '.icns' ) ) + def search_cast(self): + self.read_config() + self.set_icon_working() + """ + This catches the error caused by an empty .tmp file + """ + if os.path.exists('/tmp/mkchromecast.tmp') is True: + try: + self.tf = open('/tmp/mkchromecast.tmp', 'rb') + self.index = pickle.load(self.tf) + except EOFError: + os.remove('/tmp/mkchromecast.tmp') + + if (self.stopped is True and + os.path.exists('/tmp/mkchromecast.tmp') is True): + os.remove('/tmp/mkchromecast.tmp') + + self.thread.start() + + def cast_list(self): + self.set_icon_idle() + if len(self.availablecc) == 0: self.menu.clear() self.search_menu() self.separator_menu() - self.NodevAction = self.menu.addAction('No Streaming Devices Found.') - if os.path.exists('images/'+self.google_nodev[self.colors]+'.icns') == True: - if platform == 'Darwin': - self.tray.setIcon( - QtGui.QIcon( - 'images/' - + self.google_nodev[self.colors] - + '.icns' - ) - ) - else: - self.tray.setIcon( - QtGui.QIcon( - 'images/' - + self.google_nodev[self.colors] - + '.png' - ) - ) - else: - if platform == 'Linux': - self.tray.setIcon( - QtGui.QIcon( - '/usr/share/mkchromecast/images/' - + self.google_nodev[self.colors] - + '.png' - ) - ) - else: - self.tray.setIcon( - QtGui.QIcon( - self.google_nodev[self.colors] - +'.icns' - ) - ) + self.NodevAction = self.menu.addAction( + 'No Streaming Devices Found.') + self.set_icon_nodev() self.separator_menu() self.stop_menu() @@ -402,7 +422,8 @@ def cast_list(self): else: self.read_config() if platform == 'Darwin' and self.notifications == 'enabled': - if os.path.exists('images/'+self.google[self.colors]+'.icns') == True: + if os.path.exists('images/' + + self.google[self.colors]+'.icns') is True: noticon = 'images/'+self.google[self.colors]+'.icns' else: noticon = self.google[self.colors]+'.icns' @@ -419,32 +440,36 @@ def cast_list(self): 'Media Streaming Devices Found!' ] subprocess.Popen(found) - if debug == True: - print(':::systray:::',found) + if debug is True: + print(':::systray:::', found) elif platform == 'Linux' and self.notifications == 'enabled': try: import gi gi.require_version('Notify', '0.7') from gi.repository import Notify Notify.init('Mkchromecast') - found=Notify.Notification.new( + found = Notify.Notification.new( 'Mkchromecast', 'Media Streaming Devices Found!', 'dialog-information' ) found.show() except ImportError: - print('If you want to receive notifications in Linux, install libnotify and python-gobject') + print('If you want to receive notifications in Linux, ' + 'install libnotify and python-gobject') self.menu.clear() self.search_menu() self.separator_menu() print('Available Media Streaming Devices', self.availablecc) for index, menuentry in enumerate(self.availablecc): try: - self.a = self.ag.addAction((QtWidgets.QAction(str(menuentry[1]), self, checkable=True))) + self.a = self.ag.addAction( + (QtWidgets.QAction( + str(menuentry[1]), self, checkable=True))) self.menuentry = self.menu.addAction(self.a) except UnicodeEncodeError: - self.menuentry = self.menu.addAction(str(unicode(menuentry[1]).encode("utf-8"))) + self.menuentry = self.menu.addAction(str( + unicode(menuentry[1]).encode("utf-8"))) # The receiver is a lambda function that passes clicked as # a boolean, and the clicked_item as an argument to the # self.clicked_cc() method. This last method, sets the correct @@ -466,14 +491,14 @@ def cast_list(self): self.exit_menu() def clicked_cc(self, clicked_item): - if self.played == True: + if self.played is True: try: self.cast.quit_app() except AttributeError: self.cast.stop() - if debug == True: - print(clicked_item) + if debug is True: + print(':::tray::: clicked item: %s.' % clicked_item) self.index = clicked_item[0] self.cast_to = clicked_item[1] self.play_cast() @@ -482,120 +507,27 @@ def pcastready(self, message): print('pcastready ?', message) if message == '_play_cast_ success': self.pcastfailed = False - if os.path.exists('/tmp/mkchromecast.tmp') == True: + if os.path.exists('/tmp/mkchromecast.tmp') is True: self.cast = mkchromecast.tray_threading.cast - if os.path.exists('images/'+self.google[self.colors]+'.icns') == True: - if platform == 'Darwin': - self.tray.setIcon( - QtGui.QIcon( - 'images/' - + self.google[self.colors] - + '.icns' - ) - ) - else: - self.tray.setIcon( - QtGui.QIcon( - 'images/' - + self.google[self.colors] - + '.png' - ) - ) - else: - if platform == 'Linux': - self.tray.setIcon( - QtGui.QIcon( - '/usr/share/mkchromecast/images/' - + self.google[self.colors] - + '.png' - ) - ) - else: - self.tray.setIcon( - QtGui.QIcon( - self.google[self.colors] - +'.icns' - ) - ) + self.set_icon_idle() else: self.pcastfailed = True - if os.path.exists('images/'+self.google_nodev[self.colors]+'.icns') == True: - if platform == 'Darwin': - self.tray.setIcon( - QtGui.QIcon( - 'images/' - + self.google_nodev[self.colors] - + '.icns' - ) - ) - else: - self.tray.setIcon( - QtGui.QIcon( - 'images/' - + self.google_nodev[self.colors] - + '.png' - ) - ) - else: - if platform == 'Linux': - self.tray.setIcon( - QtGui.QIcon( - '/usr/share/mkchromecast/images/' - + self.google_nodev[self.colors] - + '.png' - ) - ) - else: - self.tray.setIcon( - QtGui.QIcon( - self.google_nodev[self.colors] - + '.icns' - ) - ) + self.set_icon_nodev() self.stop_cast() - pass # This should stop the play process when there is an error in the threading _play_cast_ + # This should stop the play process when there is an error in the + # threading _play_cast_ + pass def play_cast(self): - if self.played == True: + if self.played is True: self.kill_child() - if os.path.exists('images/'+self.google_working[self.colors]+'.icns') == True: - if platform == 'Darwin': - self.tray.setIcon( - QtGui.QIcon( - 'images/' - + self.google_working[self.colors] - + '.icns' - ) - ) - else: - self.tray.setIcon( - QtGui.QIcon( - 'images/' - + self.google_working[self.colors] - + '.png' - ) - ) - else: - if platform == 'Linux': - self.tray.setIcon( - QtGui.QIcon( - '/usr/share/mkchromecast/images/' - + self.google_working[self.colors] - + '.png' - ) - ) - else: - self.tray.setIcon( - QtGui.QIcon( - self.google_working[self.colors] - + '.icns' - ) - ) + + self.set_icon_working() while True: try: - if os.path.exists('/tmp/mkchromecast.tmp') == True: + if os.path.exists('/tmp/mkchromecast.tmp') is True: self.tf = open('/tmp/mkchromecast.tmp', 'wb') pickle.dump(self.cast_to, self.tf) self.tf.close() @@ -606,38 +538,44 @@ def play_cast(self): self.threadplay.start() def stop_cast(self): - if self.stopped == False: + if self.stopped is False: pass - if self.cast != None or self.stopped == True or self.pcastfailed == True: - + if (self.cast is not None or self.stopped is True or self.pcastfailed + is True): try: self.cast.quit_app() except AttributeError: - self.cast.stop() # This is for sonos. The thing is that if we are at this point, user requested an stop or cast failed. + # This is for sonos. The thing is that if we are at this point, + # user requested an stop or cast failed. + self.cast.stop() self.reset_audio() try: self.kill_child() except psutil.NoSuchProcess: pass - checkmktmp() + mkchromecast.__init__.checkmktmp() self.search_cast() - while True: # This is to retry when stopping and pychromecast.error.NotConnected raises. + # This is to retry when stopping and + # pychromecast.error.NotConnected raises. + while True: try: self.cast.quit_app() except pychromecast.error.NotConnected: continue except AttributeError: - self.cast.stop() # This is for sonos. The thing is that if we are at this point, user requested an stop or cast failed. + # This is for sonos. The thing is that if we are at this + # point, user requested an stop or cast failed. + self.cast.stop() break self.stopped = True self.read_config() if platform == 'Darwin' and self.notifications == 'enabled': - if self.pcastfailed == True: + if self.pcastfailed is True: stop = [ './notifier/terminal-notifier.app/Contents/MacOS/terminal-notifier', '-group', @@ -658,7 +596,7 @@ def stop_cast(self): 'Streaming Stopped!' ] subprocess.Popen(stop) - if debug == True: + if debug is True: print(':::systray::: stop', stop) elif platform == 'Linux' and self.notifications == 'enabled': @@ -667,21 +605,22 @@ def stop_cast(self): gi.require_version('Notify', '0.7') from gi.repository import Notify Notify.init('Mkchromecast') - if self.pcastfailed == True: - stop=Notify.Notification.new( + if self.pcastfailed is True: + stop = Notify.Notification.new( 'Mkchromecast', 'Streaming Process Failed. Try Again...', 'dialog-information' ) else: - stop=Notify.Notification.new( + stop = Notify.Notification.new( 'Mkchromecast', 'Streaming Stopped!', 'dialog-information' ) stop.show() except ImportError: - print('If you want to receive notifications in Linux, install libnotify and python-gobject') + print('If you want to receive notifications in Linux, ' + 'install libnotify and python-gobject') def volume_cast(self): self.sl = QtWidgets.QSlider(Qt.Horizontal) @@ -689,18 +628,19 @@ def volume_cast(self): self.sl.setGeometry( 30 * self.scale_factor, 40 * self.scale_factor, - 260 * self.scale_factor, + 260 * self.scale_factor, 70 * self.scale_factor ) self.sl.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint) try: - self.maxvolset = 40 + self.maxvolset = 100 self.sl.setMaximum(self.maxvolset) - self.sl.setValue(round((self.cast.status.volume_level*self.maxvolset), 1)) + self.sl.setValue(round((self.cast.status.volume_level*self.maxvolset), + 1)) except AttributeError: self.maxvolset = 100 self.sl.setMaximum(self.maxvolset) - if self.played == False: + if self.played is False: self.sl.setValue(2) else: try: @@ -713,32 +653,37 @@ def volume_cast(self): def value_changed(self, value): try: + """ + Chromecast volume + """ + volume = value/self.maxvolset + self.cast.set_volume(volume) if round(self.cast.status.volume_level, 1) == 1: - print (colors.warning(':::systray::: Maximum volume level reached!')) - volume = value/self.maxvolset - self.cast.set_volume(volume) - else: - volume = value/self.maxvolset - self.cast.set_volume(volume) - if debug == True: + print(colors.warning( + ':::systray::: Maximum volume level reached!')) + + if debug is True: print(':::systray::: Volume set to: '+str(volume)) except AttributeError: + pass + + try: """ Sonos volume """ self.maxvolset = 100 + volume = value + self.cast.volume = volume + self.cast.play() if (self.cast.volume) == 100: - print (colors.warning(':::systray::: Maximum volume level reached!')) - volume = value - self.cast.volume = volume - self.cast.play() - else: - volume = value - self.cast.volume = volume - self.cast.play() - if debug == True: + print(colors.warning(':::systray::: Maximum volume reached!')) + + if debug is True: print(':::systray::: Volume set to: '+str(volume)) - if debug == True: + except AttributeError: + pass + + if debug is True: print(':::systray::: Volume changed: '+str(value)) def reset_audio(self): @@ -751,7 +696,7 @@ def reset_audio(self): def reboot(self): if platform == 'Darwin': try: - self.cast.host_ = socket.gethostbyname(self.cast_to+'.local') + self.cast.host_ = socket.gethostbyname(self.cast_to + '.local') print('Cast device IP: '+str(self.cast.host_)) self.reset_audio() self.stop_cast() @@ -762,7 +707,8 @@ def reboot(self): self.stop_cast() reboot(self.cast.host) except AttributeError: - pass # I should add a notification here + # FIXME I should add a notification here + pass else: try: print('Cast device IP: %s' % str(self.cast.host)) @@ -772,13 +718,15 @@ def reboot(self): except AttributeError: self.reset_audio() self.stop_cast() - for device in self.availablecc: - if self.cast_to in device: - ip = device[3] - print('Cast device IP: %s' % str(ip)) - url = 'http://' + ip + ':1400/reboot' - urlopen(url).read() - + try: + for device in self.availablecc: + if self.cast_to in device: + ip = device[3] + print('Sonos device IP: %s' % str(ip)) + url = 'http://' + ip + ':1400/reboot' + urlopen(url).read() + except AttributeError: + pass def preferences_show(self): self.p = mkchromecast.preferences.preferences(self.scale_factor) @@ -789,16 +737,19 @@ def updateready(self, message): updaterBox = QMessageBox() updaterBox.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint) updaterBox.setIcon(QMessageBox.Information) - updaterBox.setTextFormat(Qt.RichText) # This option let you write rich text in pyqt5. + # This option let you write rich text in pyqt5. + updaterBox.setTextFormat(Qt.RichText) if message == 'None': updaterBox.setText('No network connection detected!') - updaterBox.setInformativeText("""Verify that your computer is connected to your router, and try again.""") + updaterBox.setInformativeText(""" + Verify that your computer is connected to your router, + and try again.""") elif message == 'False': updaterBox.setText('Your installation is up-to-date!') updaterBox.setInformativeText( - 'Mkchromecast v' - + mkchromecast.__init__.__version__ - + ' is currently the newest version available.' + 'Mkchromecast v' + + mkchromecast.__init__.__version__ + + ' is currently the newest version available.' ) elif message == 'error1': updaterBox.setText('Problems connecting to remote file server!') @@ -806,21 +757,21 @@ def updateready(self, message): else: updaterBox.setText('New version of Mkchromecast available!') if platform == 'Darwin': - downloadurl = ( - '' + download = ( + '' ) elif platform == 'Linux': - downloadurl = '' - if debug == True: - print('Download URL:', downloadurl) + download = '' + if debug is True: + print('Download URL:', download) updaterBox.setInformativeText( - 'You can ' - + downloadurl - + 'download it by clicking here.' + 'You can ' + + download + + 'download it by clicking here.' ) updaterBox.setStandardButtons(QMessageBox.Ok) updaterBox.exec_() @@ -831,22 +782,25 @@ def update_show(self): def about_show(self): msgBox = QMessageBox() msgBox.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint) - if os.path.exists('images/google.icns') == True: # This is useful when launching from git repo - if platform == 'Darwin': - self.abouticon='images/google.icns' + # This is useful when launching from git repo + if os.path.exists('images/google.icns') is True: + if platform is 'Darwin': + self.about_icon = 'images/google.icns' else: - self.abouticon='images/google.png' - else: # This is useful for applications - if platform == 'Linux': - self.abouticon='/usr/share/mkchromecast/images/google.png' + self.about_icon = 'images/google.png' + # This is useful for applications + else: + if platform is 'Linux': + self.about_icon = '/usr/share/mkchromecast/images/google.png' else: - self.abouticon='google.icns' + self.about_icon = 'google.icns' msgsettext = ( - '


Mkchromecast v' - + mkchromecast.__init__.__version__ + '


' + + ' Mkchromecast v' + + mkchromecast.__init__.__version__ ) msgBox.setText(msgsettext) msgBox.setInformativeText(""" @@ -867,7 +821,10 @@ def about_show(self):
This program comes with absolutely no warranty.
- See the MIT license for details. + See the + + MIT license for details.

""") msgBox.exec_() @@ -875,13 +832,15 @@ def about_show(self): def kill_child(self): # Not a beautiful name, I know... self.parent_pid = getpid() self.parent = psutil.Process(self.parent_pid) - for child in self.parent.children(recursive=True): # or parent.children() for recursive=False + # or parent.children() for recursive=False + for child in self.parent.children(recursive=True): child.kill() def exit_all(self): - if self.cast == None and self.stopped == False: + del_tmp() + if self.cast is None and self.stopped is False: self.app.quit() - elif self.stopped == True or self.cast != None: + elif self.stopped is True or self.cast is not None: self.kill_child() self.stop_cast() self.app.quit() @@ -892,17 +851,19 @@ def exit_all(self): Notifications """ def search_notification(self): - if platform == 'Darwin' and self.notifications == 'enabled': - if os.path.exists('images/'+self.google[self.colors]+'.icns') == True: + if platform is 'Darwin' and self.notifications is 'enabled': + if os.path.exists('images/' + + self.google[self.colors] + + '.icns') is True: noticon = ( - 'images/' - + self.google[self.colors] - + '.icns' + 'images/' + + self.google[self.colors] + + '.icns' ) else: noticon = ( - self.google[self.colors] - + '.icns' + self.google[self.colors] + + '.icns' ) searching = [ './notifier/terminal-notifier.app/Contents/MacOS/terminal-notifier', @@ -916,26 +877,28 @@ def search_notification(self): 'Searching for Media Streaming Devices...' ] subprocess.Popen(searching) - if debug == True: - print(':::systray:::',searching) + if debug is True: + print(':::systray:::', searching) elif platform == 'Linux' and self.notifications == 'enabled': try: import gi gi.require_version('Notify', '0.7') from gi.repository import Notify Notify.init('Mkchromecast') - found=Notify.Notification.new( + found = Notify.Notification.new( 'Mkchromecast', 'Searching for Media Streaming Devices...', 'dialog-information' ) found.show() except ImportError: - print('If you want to receive notifications in Linux, install libnotify and python-gobject') + print('If you want to receive notifications in Linux, ' + 'install libnotify and python-gobject.') + def main(): menubar() if __name__ == '__main__': - checkmktmp() + mkchromecast.__init__.checkmktmp() main() diff --git a/mkchromecast/tray_threading.py b/mkchromecast/tray_threading.py index 91c43fec7..d354218c4 100644 --- a/mkchromecast/tray_threading.py +++ b/mkchromecast/tray_threading.py @@ -3,32 +3,33 @@ # This file is part of mkchromecast. import mkchromecast.__init__ -from mkchromecast.audio_devices import * -from mkchromecast.cast import * -from mkchromecast.config import * +from mkchromecast.audio_devices import inputdev, outputdev +from mkchromecast.cast import casting +from mkchromecast.config import config_manager import mkchromecast.audio -from mkchromecast.node import * +from mkchromecast.node import stream from mkchromecast.preferences import ConfigSectionMap from mkchromecast.pulseaudio import create_sink, check_sink -from mkchromecast.systray import * -from PyQt5.QtCore import (QThread, QObject, pyqtSignal, pyqtSlot) +from PyQt5.QtCore import (QObject, pyqtSignal, pyqtSlot) import os.path -import pickle -import pychromecast +import socket +import mkchromecast.colors as colors """ Configparser is imported differently in Python3 """ try: import ConfigParser except ImportError: - import configparser as ConfigParser # This is for Python3 + import configparser as ConfigParser platform = mkchromecast.__init__.platform debug = mkchromecast.__init__.debug config = ConfigParser.RawConfigParser() -configurations = config_manager() # Class from mkchromecast.config +# Class from mkchromecast.config +configurations = config_manager() configf = configurations.configf + class Worker(QObject): finished = pyqtSignal() intReady = pyqtSignal(list) @@ -38,17 +39,20 @@ def __init__(self): @pyqtSlot() def _search_cast_(self): - try: # This should fix the error socket.gaierror making the system tray to be closed. + # This should fix the error socket.gaierror making the system tray to + # be closed. + try: self.cc = casting() self.cc.initialize_cast() self.cc.availablecc() except socket.gaierror: - if debug == True: - print(colors.warning(':::Threading::: Socket error, CC set to 0')) + if debug is True: + print(colors.warning( + ':::Threading::: Socket error, CC set to 0')) pass except TypeError: pass - if len(self.cc.availablecc) == 0 and tray == True: + if len(self.cc.availablecc) == 0 and tray is True: availablecc = [] self.intReady.emit(availablecc) self.finished.emit() @@ -57,6 +61,7 @@ def _search_cast_(self): self.intReady.emit(availablecc) self.finished.emit() + class Player(QObject): pcastfinished = pyqtSignal() pcastready = pyqtSignal(str) @@ -67,11 +72,11 @@ def __init__(self): @pyqtSlot() def _play_cast_(self): if os.path.exists(configf): - print(colors.warning(':::Threading::: Configuration file exists')) - print(colors.warning(':::Threading::: Using defaults set there')) + print(colors.warning(':::Threading::: Configuration file exists.')) + print(colors.warning(':::Threading::: Using defaults set there.')) config.read(configf) backend = ConfigSectionMap('settings')['backend'] - print(':::Threading backend::: '+backend) + print(':::Threading backend::: %s.' % backend) else: backend = mkchromecast.__init__.backend global cast @@ -85,7 +90,8 @@ def _play_cast_(self): reload(mkchromecast.audio) mkchromecast.audio.main() if platform == 'Linux': - if check_sink() == False: # We create the sink only if it is not available + # We create the sink only if it is not available + if check_sink() is False: create_sink() start = casting() @@ -94,14 +100,22 @@ def _play_cast_(self): start.get_cc() start.play_cast() cast = start.cast - if platform == 'Darwin': # Let's change inputs at the end to avoid muting sound too early. - inputdev() # For Linux it does not matter given that user has to select sink in pulse audio. - outputdev() # Therefore the sooner it is available, the better. + # Let's change inputs at the end to avoid muting sound too early. + # For Linux it does not matter given that user has to select sink + # in pulse audio. Therefore the sooner it is available, the + # better. + if platform == 'Darwin': + inputdev() + outputdev() self.pcastready.emit('_play_cast_ success') except AttributeError: self.pcastready.emit('_play_cast_ failed') self.pcastfinished.emit() + +url = 'https://api.github.com/repos/muammar/mkchromecast/releases/latest' + + class Updater(QObject): """This class is employed to check for new mkchromecast versions""" upcastfinished = pyqtSignal() @@ -119,7 +133,6 @@ def _updater_(self): try: from mkchromecast.version import __version__ import requests - url = 'https://api.github.com/repos/muammar/mkchromecast/releases/latest' response = requests.get(url).text.split(',') for e in response: @@ -128,10 +141,10 @@ def _updater_(self): break if version > __version__: - print ('Version ' + version + ' is available to download') + print('Version %s is available to download' % version) self.updateready.emit(version) else: - print ('You are up to date') + print('You are up to date.') self.updateready.emit('False') except UnboundLocalError: self.updateready.emit('error1') diff --git a/mkchromecast/utils.py b/mkchromecast/utils.py index 5363e8f9a..93656d5d7 100644 --- a/mkchromecast/utils.py +++ b/mkchromecast/utils.py @@ -5,35 +5,61 @@ from os import getpid import psutil import os.path +import mkchromecast.colors as colors +try: + from urlparse import urlparse +except: + from urllib.parse import urlparse """ -These functions are used to kill main processes and child. - To call them: - from mkchromecast.terminate import * + from mkchromecast.terminate import name name() """ -def terminate(): - if os.path.exists('/tmp/mkchromecast.tmp') == True: - os.remove('/tmp/mkchromecast.tmp') +def terminate(): + del_tmp() parent_pid = getpid() parent = psutil.Process(parent_pid) - for child in parent.children(recursive=True): # or parent.children() for recursive=False + for child in parent.children(recursive=True): child.kill() parent.kill() return + +def del_tmp(): + """Delete files created in /tmp/""" + delete_me = ['/tmp/mkchromecast.tmp', '/tmp/mkchromecast.pid'] + + print(colors.important('Cleaning up /tmp/...')) + + for f in delete_me: + if os.path.exists(f) is True: + os.remove(f) + + print(colors.success('[Done]')) + return + + def is_installed(name, path, debug): PATH = path iterate = PATH.split(':') for item in iterate: - verifyif = str(item+'/'+name) - if os.path.exists(verifyif) == False: + verifyif = str(item + '/' + name) + if os.path.exists(verifyif) is False: continue else: - if debug == True: - print('Program '+str(name)+' found in '+str(verifyif)) + if debug is True: + print('Program %s found in %s.' % (name, verifyif)) return True return + + +def check_url(url): + """Check if a URL is correct""" + try: + result = urlparse(url) + return True if [result.scheme, result.netloc, result.path] else False + except Exception as e: + return False diff --git a/mkchromecast/version.py b/mkchromecast/version.py index 7ae729a04..d1308ffef 100644 --- a/mkchromecast/version.py +++ b/mkchromecast/version.py @@ -2,4 +2,4 @@ # This file is part of mkchromecast. -__version__ = '0.3.7.1' +__version__ = '0.3.8' diff --git a/mkchromecast/video.py b/mkchromecast/video.py index 556b70e01..f71bd93e7 100644 --- a/mkchromecast/video.py +++ b/mkchromecast/video.py @@ -7,11 +7,10 @@ """ import mkchromecast.__init__ -from mkchromecast.audio_devices import * +from mkchromecast.audio_devices import inputint, outputint import mkchromecast.colors as colors -from mkchromecast.config import * from mkchromecast.utils import terminate, is_installed -from mkchromecast.preferences import ConfigSectionMap +from mkchromecast.resolution import resolution import psutil import getpass import pickle @@ -19,15 +18,17 @@ import time from functools import partial from subprocess import Popen, PIPE -from flask import Flask, Response, request +from flask import Flask, Response import multiprocessing import threading import os from os import getpid + +appendtourl = 'stream' USER = getpass.getuser() chunk_size = mkchromecast.__init__.chunk_size -appendtourl = 'stream' +user_command = mkchromecast.__init__.command platform = mkchromecast.__init__.platform subtitles = mkchromecast.__init__.subtitles input_file = mkchromecast.__init__.input_file @@ -36,43 +37,26 @@ debug = mkchromecast.__init__.debug sourceurl = mkchromecast.__init__.sourceurl encoder_backend = mkchromecast.__init__.backend +screencast = mkchromecast.__init__.screencast +port = mkchromecast.__init__.port try: youtubeurl = mkchromecast.__init__.youtubeurl except AttributeError: youtubeurl = None -def resolution(res): - if res.lower() == '480p': - insert = ['-vf', 'scale=853:-1'] - return insert - if res.lower() == '720p': - insert = ['-vf', 'scale=1280:-1'] - return insert - if res.lower() == '1080p': - insert = ['-vf', 'scale=1920:-1'] - return insert - if res.lower() == '2k': - insert = ['-vf', 'scale=2048:-1'] - return insert - if res.lower() == 'uhd': - insert = ['-vf', 'scale=3840:-1'] - return insert - if res.lower() == '4k': - insert = ['-vf', 'scale=4096:-1'] - return insert def seeking(seek): seek_append = ['-ss', seek] for i, _ in enumerate(seek_append): - command.insert(i + 1, _) + command.insert(i + 1, _) """ This command is not working I found this: http://stackoverflow.com/questions/12801192/client-closes-connection-when-streaming-m4v-from-apache-to-chrome-with-jplayer. I think that the command below is sending a file that is too big and the browser closes the connection. """ -if youtubeurl != None: +if youtubeurl is not None: command = [ 'youtube-dl', '-o', @@ -81,91 +65,131 @@ def seeking(seek): ] mtype = 'video/mp4' +elif screencast is True: + if res is None: + screen_size = resolution('1080p', screencast) + else: + screen_size = resolution(res, screencast) + command = [ + 'ffmpeg', + '-f', 'x11grab', + '-r', '25', + '-s', screen_size, + '-i', ':0.0+0,0', + '-vcodec', 'libx264', + '-preset', 'ultrafast', + '-tune', 'zerolatency', + '-maxrate', '10000k', + '-bufsize', '20000k', + '-pix_fmt', 'yuv420p', + '-g', '60', # '-c:a', 'copy', '-ac', '2', + # '-b', '900k', + '-f', 'mp4', + '-max_muxing_queue_size', '9999', + '-movflags', 'frag_keyframe+empty_moov', + 'pipe:1' + ] + mtype = 'video/mp4' else: """ The blocks shown below are related to input_files """ - if input_file != None and subtitles == None: + if input_file is not None and subtitles is None: """ command = [ 'ffmpeg', '-re', #'-loglevel', 'panic', '-i', input_file, + '-map_chapters', '-1', '-preset', 'ultrafast', '-f', 'mp4', - '-movflags', 'frag_keyframe+faststart ', + '-max_muxing_queue_size', '9999', + '-movflags', 'frag_keyframe+empty_moov', 'pipe:1' ] """ - # Command taken from https://trac.ffmpeg.org/wiki/EncodingForStreamingSites#Streamingafile + # Command taken from + # https://trac.ffmpeg.org/wiki/EncodingForStreamingSites#Streamingafile command = [ 'ffmpeg', '-re', '-i', input_file, + '-map_chapters', '-1', '-vcodec', 'libx264', '-preset', 'ultrafast', '-tune', 'zerolatency', '-maxrate', '10000k', '-bufsize', '20000k', '-pix_fmt', 'yuv420p', - '-g', '60', #'-c:a', 'copy', '-ac', '2', - #'-b', '900k', + '-g', '60', # '-c:a', 'copy', '-ac', '2', + # '-b', '900k', '-f', 'mp4', - '-movflags', 'frag_keyframe+faststart ', + '-max_muxing_queue_size', '9999', + '-movflags', 'frag_keyframe+empty_moov', 'pipe:1' ] - elif input_file != None and subtitles != None: + elif input_file is not None and subtitles is not None: """ command = [ 'ffmpeg', '-re', '-i', input_file, + '-map_chapters', '-1', '-preset', 'ultrafast', '-f', 'mp4', - '-movflags', 'frag_keyframe+faststart ', + '-max_muxing_queue_size', '9999', + '-movflags', 'frag_keyframe+empty_moov', '-vf', 'subtitles='+subtitles, 'pipe:1' ] """ - # Command taken from https://trac.ffmpeg.org/wiki/EncodingForStreamingSites#Streamingafile + # Command taken from + # https://trac.ffmpeg.org/wiki/EncodingForStreamingSites#Streamingafile command = [ 'ffmpeg', '-re', '-i', input_file, + '-map_chapters', '-1', '-vcodec', 'libx264', '-preset', 'ultrafast', '-tune', 'zerolatency', '-maxrate', '10000k', '-bufsize', '20000k', '-pix_fmt', 'yuv420p', - '-g', '60', #'-c:a', 'copy', '-ac', '2', - #'-b', '900k', + '-g', '60', # '-c:a', 'copy', '-ac', '2', + # '-b', '900k', '-f', 'mp4', - '-movflags', 'frag_keyframe+faststart ', + '-max_muxing_queue_size', '9999', + '-movflags', 'frag_keyframe+empty_moov', '-vf', 'subtitles='+subtitles, 'pipe:1' ] - if seek != None: + if user_command is not None: + command = user_command + + if seek is not None: seeking(seek) - if debug == False and sourceurl == None: + if debug is False and sourceurl is None: command.insert(command.index('-i'), 'panic') command.insert(command.index('panic'), '-loglevel') mtype = 'video/mp4' - if res != None: + + if res is not None: cindex = command.index(input_file) - res_elements = resolution(res) + res_elements = resolution(res, screencast) for element in res_elements: command.insert(-cindex, element) app = Flask(__name__) -if debug == True: - print(':::ffmpeg::: command '+str(command)) +if debug is True: + print(':::ffmpeg::: command: %s.' % command) + @app.route('/') def index(): @@ -194,16 +218,20 @@ def shutdown(): return 'Server shutting down...' """ + + @app.route('/' + appendtourl) def stream(): process = Popen(command, stdout=PIPE, bufsize=-1) read_chunk = partial(os.read, process.stdout.fileno(), chunk_size) return Response(iter(read_chunk, b''), mimetype=mtype) + def start_app(): monitor_daemon = monitor() monitor_daemon.start() - app.run(host= '0.0.0.0', threaded = True) + app.run(host='0.0.0.0', port=port, threaded=True) + class multi_proc(object): # I launch ffmpeg in a different process def __init__(self): @@ -218,6 +246,8 @@ def start(self): A normal running of mkchromecast will have 2 threads in the streaming process when ffmpeg is used. """ + + class monitor(object): def __init__(self): self.monitor_d = threading.Thread(target=monitor_daemon) @@ -226,26 +256,30 @@ def __init__(self): def start(self): self.monitor_d.start() + def monitor_daemon(): f = open('/tmp/mkchromecast.pid', 'rb') - pidnumber=int(pickle.load(f)) - print(colors.options('PID of main process:')+' '+str(pidnumber)) + pidnumber = int(pickle.load(f)) + print(colors.options('PID of main process:') + ' ' + str(pidnumber)) - localpid=getpid() - print(colors.options('PID of streaming process:')+' '+str(localpid)) + localpid = getpid() + print(colors.options('PID of streaming process:') + ' ' + str(localpid)) - while psutil.pid_exists(localpid) == True: + while psutil.pid_exists(localpid) is True: try: time.sleep(0.5) - if psutil.pid_exists(pidnumber) == False: # With this I ensure that if the main app fails, everything - if platform == 'Darwin': # will get back to normal + # With this I ensure that if the main app fails, everything# With + # this I ensure that if the main app fails, everything + # will get back to normal + if psutil.pid_exists(pidnumber) is False: + if platform == 'Darwin': inputint() outputint() else: from mkchromecast.pulseaudio import remove_sink remove_sink() parent = psutil.Process(localpid) - for child in parent.children(recursive=True): # or parent.children() for recursive=False + for child in parent.children(recursive=True): child.kill() parent.kill() except KeyboardInterrupt: @@ -258,6 +292,7 @@ def monitor_daemon(): print('OSError') sys.exit(0) + def main(): if encoder_backend != 'node': st = multi_proc() @@ -265,24 +300,27 @@ def main(): else: print('Starting Node') if platform == 'Darwin': - PATH ='./bin:./nodejs/bin:/Users/'+str(USER)+'/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/X11/bin:/usr/games:'+ os.environ['PATH'] + PATH = './bin:./nodejs/bin:/Users/' + \ + str(USER) + \ + '/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/X11/bin:/usr/games:' + \ + os.environ['PATH'] else: PATH = os.environ['PATH'] - if debug == True: - print('PATH ='+str(PATH)) + if debug is True: + print('PATH = %s.' % PATH) - if platform == 'Darwin' and os.path.exists('./bin/node') == True: + if platform == 'Darwin' and os.path.exists('./bin/node') is True: webcast = [ './bin/node', './nodejs/html5-video-streamer.js', input_file ] elif platform == 'Linux': - node_names =['node', 'nodejs'] + node_names = ['node', 'nodejs'] nodejs_dir = ['./nodejs/', '/usr/share/mkchromecast/nodejs/'] for name in node_names: - if is_installed(name, PATH, debug) == True: + if is_installed(name, PATH, debug) is True: for path in nodejs_dir: if os.path.isdir(path): path = path + 'html5-video-streamer.js' @@ -293,8 +331,9 @@ def main(): ] break try: - p = subprocess.Popen(webcast) + Popen(webcast) except: - print(colors.warning('Nodejs is not installed in your system. Please, install it to use this backend.')) + print(colors.warning('Nodejs is not installed in your system. ' + 'Please, install it to use this backend.')) print(colors.warning('Closing the application...')) terminate() diff --git a/nodejs/README.md b/nodejs/README.md index d41e8c0f8..7854823bf 100644 --- a/nodejs/README.md +++ b/nodejs/README.md @@ -18,3 +18,6 @@ Example: ``` This will install the package at `mkchromecast/nodejs/node-$version`. + +**Note**: I am now just using node shipped by Homebrew. I might remove this in +the future. diff --git a/nodejs/bin/node b/nodejs/bin/node index 3543401ce..c8ea45dc6 100755 Binary files a/nodejs/bin/node and b/nodejs/bin/node differ diff --git a/nodejs/node_modules/accepts/HISTORY.md b/nodejs/node_modules/accepts/HISTORY.md index 0477ed71c..aaf528172 100644 --- a/nodejs/node_modules/accepts/HISTORY.md +++ b/nodejs/node_modules/accepts/HISTORY.md @@ -1,3 +1,9 @@ +1.3.4 / 2017-08-22 +================== + + * deps: mime-types@~2.1.16 + - deps: mime-db@~1.29.0 + 1.3.3 / 2016-05-02 ================== diff --git a/nodejs/node_modules/accepts/README.md b/nodejs/node_modules/accepts/README.md index ae36676f2..6a2749a1a 100644 --- a/nodejs/node_modules/accepts/README.md +++ b/nodejs/node_modules/accepts/README.md @@ -6,23 +6,31 @@ [![Build Status][travis-image]][travis-url] [![Test Coverage][coveralls-image]][coveralls-url] -Higher level content negotiation based on [negotiator](https://www.npmjs.com/package/negotiator). Extracted from [koa](https://www.npmjs.com/package/koa) for general use. +Higher level content negotiation based on [negotiator](https://www.npmjs.com/package/negotiator). +Extracted from [koa](https://www.npmjs.com/package/koa) for general use. In addition to negotiator, it allows: -- Allows types as an array or arguments list, ie `(['text/html', 'application/json'])` as well as `('text/html', 'application/json')`. +- Allows types as an array or arguments list, ie `(['text/html', 'application/json'])` + as well as `('text/html', 'application/json')`. - Allows type shorthands such as `json`. - Returns `false` when no types match - Treats non-existent headers as `*` ## Installation +This is a [Node.js](https://nodejs.org/en/) module available through the +[npm registry](https://www.npmjs.com/). Installation is done using the +[`npm install` command](https://docs.npmjs.com/getting-started/installing-npm-packages-locally): + ```sh -npm install accepts +$ npm install accepts ``` ## API + + ```js var accepts = require('accepts') ``` @@ -88,11 +96,11 @@ server. var accepts = require('accepts') var http = require('http') -function app(req, res) { +function app (req, res) { var accept = accepts(req) // the order of this list is significant; should be server preferred order - switch(accept.type(['json', 'html'])) { + switch (accept.type(['json', 'html'])) { case 'json': res.setHeader('Content-Type', 'application/json') res.write('{"hello":"world!"}') @@ -126,7 +134,7 @@ curl -I -H'Accept: text/html' http://localhost:3000/ [npm-image]: https://img.shields.io/npm/v/accepts.svg [npm-url]: https://npmjs.org/package/accepts [node-version-image]: https://img.shields.io/node/v/accepts.svg -[node-version-url]: http://nodejs.org/download/ +[node-version-url]: https://nodejs.org/en/download/ [travis-image]: https://img.shields.io/travis/jshttp/accepts/master.svg [travis-url]: https://travis-ci.org/jshttp/accepts [coveralls-image]: https://img.shields.io/coveralls/jshttp/accepts/master.svg diff --git a/nodejs/node_modules/accepts/index.js b/nodejs/node_modules/accepts/index.js index e80192abf..e9b2f63fb 100644 --- a/nodejs/node_modules/accepts/index.js +++ b/nodejs/node_modules/accepts/index.js @@ -29,9 +29,10 @@ module.exports = Accepts * @public */ -function Accepts(req) { - if (!(this instanceof Accepts)) +function Accepts (req) { + if (!(this instanceof Accepts)) { return new Accepts(req) + } this.headers = req.headers this.negotiator = new Negotiator(req) @@ -95,12 +96,18 @@ Accepts.prototype.types = function (types_) { return this.negotiator.mediaTypes() } - if (!this.headers.accept) return types[0]; - var mimes = types.map(extToMime); - var accepts = this.negotiator.mediaTypes(mimes.filter(validMime)); - var first = accepts[0]; - if (!first) return false; - return types[mimes.indexOf(first)]; + // no accept header, return first given type + if (!this.headers.accept) { + return types[0] + } + + var mimes = types.map(extToMime) + var accepts = this.negotiator.mediaTypes(mimes.filter(validMime)) + var first = accepts[0] + + return first + ? types[mimes.indexOf(first)] + : false } /** @@ -212,7 +219,7 @@ Accepts.prototype.languages = function (languages_) { * @private */ -function extToMime(type) { +function extToMime (type) { return type.indexOf('/') === -1 ? mime.lookup(type) : type @@ -226,6 +233,6 @@ function extToMime(type) { * @private */ -function validMime(type) { - return typeof type === 'string'; +function validMime (type) { + return typeof type === 'string' } diff --git a/nodejs/node_modules/accepts/package.json b/nodejs/node_modules/accepts/package.json index 3eea7ce77..4b11981cf 100644 --- a/nodejs/node_modules/accepts/package.json +++ b/nodejs/node_modules/accepts/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "accepts@~1.3.3", - "scope": null, - "escapedName": "accepts", - "name": "accepts", - "rawSpec": "~1.3.3", - "spec": ">=1.3.3 <1.4.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "accepts@1.3.4", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "accepts@>=1.3.3 <1.4.0", - "_id": "accepts@1.3.3", - "_inCache": true, + "_from": "accepts@1.3.4", + "_id": "accepts@1.3.4", + "_inBundle": false, + "_integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=", "_location": "/accepts", - "_nodeVersion": "4.4.3", - "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/accepts-1.3.3.tgz_1462251932032_0.7092335098423064" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.1", "_phantomChildren": {}, "_requested": { - "raw": "accepts@~1.3.3", - "scope": null, - "escapedName": "accepts", + "type": "version", + "registry": true, + "raw": "accepts@1.3.4", "name": "accepts", - "rawSpec": "~1.3.3", - "spec": ">=1.3.3 <1.4.0", - "type": "range" + "escapedName": "accepts", + "rawSpec": "1.3.4", + "saveSpec": null, + "fetchSpec": "1.3.4" }, "_requiredBy": [ "/express" ], - "_resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", - "_shasum": "c3ca7434938648c3e0d9c1e328dd68b622c284ca", - "_shrinkwrap": null, - "_spec": "accepts@~1.3.3", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", + "_spec": "1.3.4", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/accepts/issues" }, @@ -60,19 +42,21 @@ } ], "dependencies": { - "mime-types": "~2.1.11", + "mime-types": "~2.1.16", "negotiator": "0.6.1" }, "description": "Higher-level content negotiation", "devDependencies": { - "istanbul": "0.4.3", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", + "istanbul": "0.4.5", "mocha": "~1.21.5" }, - "directories": {}, - "dist": { - "shasum": "c3ca7434938648c3e0d9c1e328dd68b622c284ca", - "tarball": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -81,7 +65,6 @@ "HISTORY.md", "index.js" ], - "gitHead": "3e925b1e65ed7da2798849683d49814680dfa426", "homepage": "https://github.com/jshttp/accepts#readme", "keywords": [ "content", @@ -90,23 +73,16 @@ "accepts" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "accepts", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/accepts.git" }, "scripts": { + "lint": "eslint --plugin markdown --ext js,md .", "test": "mocha --reporter spec --check-leaks --bail test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/", "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/" }, - "version": "1.3.3" + "version": "1.3.4" } diff --git a/nodejs/node_modules/ansi-regex/package.json b/nodejs/node_modules/ansi-regex/package.json index b9b95f722..681cf2f3a 100644 --- a/nodejs/node_modules/ansi-regex/package.json +++ b/nodejs/node_modules/ansi-regex/package.json @@ -1,46 +1,33 @@ { "_args": [ [ - { - "raw": "ansi-regex@^0.2.0", - "scope": null, - "escapedName": "ansi-regex", - "name": "ansi-regex", - "rawSpec": "^0.2.0", - "spec": ">=0.2.0 <0.3.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/has-ansi" + "ansi-regex@0.2.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "ansi-regex@>=0.2.0 <0.3.0", + "_from": "ansi-regex@0.2.1", "_id": "ansi-regex@0.2.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=", "_location": "/ansi-regex", - "_npmUser": { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - }, - "_npmVersion": "1.4.9", "_phantomChildren": {}, "_requested": { - "raw": "ansi-regex@^0.2.0", - "scope": null, - "escapedName": "ansi-regex", + "type": "version", + "registry": true, + "raw": "ansi-regex@0.2.1", "name": "ansi-regex", - "rawSpec": "^0.2.0", - "spec": ">=0.2.0 <0.3.0", - "type": "range" + "escapedName": "ansi-regex", + "rawSpec": "0.2.1", + "saveSpec": null, + "fetchSpec": "0.2.1" }, "_requiredBy": [ "/has-ansi", "/strip-ansi" ], "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "_shasum": "0d8e946967a3d8143f93e24e298525fc1b2235f9", - "_shrinkwrap": null, - "_spec": "ansi-regex@^0.2.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/has-ansi", + "_spec": "0.2.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -49,23 +36,17 @@ "bugs": { "url": "https://github.com/sindresorhus/ansi-regex/issues" }, - "dependencies": {}, "description": "Regular expression for matching ANSI escape codes", "devDependencies": { "mocha": "*" }, - "directories": {}, - "dist": { - "shasum": "0d8e946967a3d8143f93e24e298525fc1b2235f9", - "tarball": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz" - }, "engines": { "node": ">=0.10.0" }, "files": [ "index.js" ], - "homepage": "https://github.com/sindresorhus/ansi-regex", + "homepage": "https://github.com/sindresorhus/ansi-regex#readme", "keywords": [ "ansi", "styles", @@ -94,18 +75,10 @@ "pattern" ], "license": "MIT", - "maintainers": [ - { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - } - ], "name": "ansi-regex", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", - "url": "git://github.com/sindresorhus/ansi-regex.git" + "url": "git+https://github.com/sindresorhus/ansi-regex.git" }, "scripts": { "test": "mocha" diff --git a/nodejs/node_modules/ansi-styles/package.json b/nodejs/node_modules/ansi-styles/package.json index 802c666e7..68d32f50b 100644 --- a/nodejs/node_modules/ansi-styles/package.json +++ b/nodejs/node_modules/ansi-styles/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "ansi-styles@^1.1.0", - "scope": null, - "escapedName": "ansi-styles", - "name": "ansi-styles", - "rawSpec": "^1.1.0", - "spec": ">=1.1.0 <2.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk" + "ansi-styles@1.1.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "ansi-styles@>=1.1.0 <2.0.0", + "_from": "ansi-styles@1.1.0", "_id": "ansi-styles@1.1.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=", "_location": "/ansi-styles", - "_npmUser": { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - }, - "_npmVersion": "1.4.9", "_phantomChildren": {}, "_requested": { - "raw": "ansi-styles@^1.1.0", - "scope": null, - "escapedName": "ansi-styles", + "type": "version", + "registry": true, + "raw": "ansi-styles@1.1.0", "name": "ansi-styles", - "rawSpec": "^1.1.0", - "spec": ">=1.1.0 <2.0.0", - "type": "range" + "escapedName": "ansi-styles", + "rawSpec": "1.1.0", + "saveSpec": null, + "fetchSpec": "1.1.0" }, "_requiredBy": [ "/chalk" ], "_resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "_shasum": "eaecbf66cd706882760b2f4691582b8f55d7a7de", - "_shrinkwrap": null, - "_spec": "ansi-styles@^1.1.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk", + "_spec": "1.1.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -48,23 +35,17 @@ "bugs": { "url": "https://github.com/sindresorhus/ansi-styles/issues" }, - "dependencies": {}, "description": "ANSI escape codes for styling strings in the terminal", "devDependencies": { "mocha": "*" }, - "directories": {}, - "dist": { - "shasum": "eaecbf66cd706882760b2f4691582b8f55d7a7de", - "tarball": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz" - }, "engines": { "node": ">=0.10.0" }, "files": [ "index.js" ], - "homepage": "https://github.com/sindresorhus/ansi-styles", + "homepage": "https://github.com/sindresorhus/ansi-styles#readme", "keywords": [ "ansi", "styles", @@ -88,18 +69,10 @@ "text" ], "license": "MIT", - "maintainers": [ - { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - } - ], "name": "ansi-styles", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", - "url": "git://github.com/sindresorhus/ansi-styles.git" + "url": "git+https://github.com/sindresorhus/ansi-styles.git" }, "scripts": { "test": "mocha" diff --git a/nodejs/node_modules/array-flatten/package.json b/nodejs/node_modules/array-flatten/package.json index 00604f38c..cf6aa4241 100644 --- a/nodejs/node_modules/array-flatten/package.json +++ b/nodejs/node_modules/array-flatten/package.json @@ -1,46 +1,32 @@ { "_args": [ [ - { - "raw": "array-flatten@1.1.1", - "scope": null, - "escapedName": "array-flatten", - "name": "array-flatten", - "rawSpec": "1.1.1", - "spec": "1.1.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "array-flatten@1.1.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "array-flatten@1.1.1", "_id": "array-flatten@1.1.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", "_location": "/array-flatten", - "_nodeVersion": "2.3.3", - "_npmUser": { - "name": "blakeembrey", - "email": "hello@blakeembrey.com" - }, - "_npmVersion": "2.11.3", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "array-flatten@1.1.1", - "scope": null, - "escapedName": "array-flatten", "name": "array-flatten", + "escapedName": "array-flatten", "rawSpec": "1.1.1", - "spec": "1.1.1", - "type": "version" + "saveSpec": null, + "fetchSpec": "1.1.1" }, "_requiredBy": [ "/express" ], "_resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "_shasum": "9a5f699051b1e7073328f2a008968b64ea2955d2", - "_shrinkwrap": null, - "_spec": "array-flatten@1.1.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.1.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Blake Embrey", "email": "hello@blakeembrey.com", @@ -49,7 +35,6 @@ "bugs": { "url": "https://github.com/blakeembrey/array-flatten/issues" }, - "dependencies": {}, "description": "Flatten an array of nested arrays into a single flat array", "devDependencies": { "istanbul": "^0.3.13", @@ -57,16 +42,10 @@ "pre-commit": "^1.0.7", "standard": "^3.7.3" }, - "directories": {}, - "dist": { - "shasum": "9a5f699051b1e7073328f2a008968b64ea2955d2", - "tarball": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" - }, "files": [ "array-flatten.js", "LICENSE" ], - "gitHead": "1963a9189229d408e1e8f585a00c8be9edbd1803", "homepage": "https://github.com/blakeembrey/array-flatten", "keywords": [ "array", @@ -76,15 +55,7 @@ ], "license": "MIT", "main": "array-flatten.js", - "maintainers": [ - { - "name": "blakeembrey", - "email": "hello@blakeembrey.com" - } - ], "name": "array-flatten", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/blakeembrey/array-flatten.git" diff --git a/nodejs/node_modules/bindings/README.md b/nodejs/node_modules/bindings/README.md index 585cf512b..a1f0d2259 100644 --- a/nodejs/node_modules/bindings/README.md +++ b/nodejs/node_modules/bindings/README.md @@ -69,6 +69,7 @@ Error: Could not load the bindings file. Tried: ... ``` +The searching for the `.node` file will originate from the first directory in which has a `package.json` file is found. License ------- diff --git a/nodejs/node_modules/bindings/bindings.js b/nodejs/node_modules/bindings/bindings.js index 93dcf85a1..9a497bf0d 100644 --- a/nodejs/node_modules/bindings/bindings.js +++ b/nodejs/node_modules/bindings/bindings.js @@ -7,7 +7,8 @@ var fs = require('fs') , path = require('path') , join = path.join , dirname = path.dirname - , exists = fs.existsSync || path.existsSync + , exists = ((fs.accessSync && function (path) { try { fs.accessSync(path); } catch (e) { return false; } return true; }) + || fs.existsSync || path.existsSync) , defaults = { arrow: process.env.NODE_BINDINGS_ARROW || ' → ' , compiled: process.env.NODE_BINDINGS_COMPILED_DIR || 'compiled' @@ -48,7 +49,11 @@ function bindings (opts) { } else if (!opts) { opts = {} } - opts.__proto__ = defaults + + // maps `defaults` onto `opts` object + Object.keys(defaults).map(function(i) { + if (!(i in opts)) opts[i] = defaults[i]; + }); // Get the module root if (!opts.module_root) { diff --git a/nodejs/node_modules/bindings/package.json b/nodejs/node_modules/bindings/package.json index 4b289fa90..a3971ad06 100644 --- a/nodejs/node_modules/bindings/package.json +++ b/nodejs/node_modules/bindings/package.json @@ -1,46 +1,33 @@ { "_args": [ [ - { - "raw": "bindings@^1.2.1", - "scope": null, - "escapedName": "bindings", - "name": "bindings", - "rawSpec": "^1.2.1", - "spec": ">=1.2.1 <2.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/lame" + "bindings@1.3.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "bindings@>=1.2.1 <2.0.0", - "_id": "bindings@1.2.1", - "_inCache": true, + "_from": "bindings@1.3.0", + "_id": "bindings@1.3.0", + "_inBundle": false, + "_integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==", "_location": "/bindings", - "_npmUser": { - "name": "tootallnate", - "email": "nathan@tootallnate.net" - }, - "_npmVersion": "1.4.14", "_phantomChildren": {}, "_requested": { - "raw": "bindings@^1.2.1", - "scope": null, - "escapedName": "bindings", + "type": "version", + "registry": true, + "raw": "bindings@1.3.0", "name": "bindings", - "rawSpec": "^1.2.1", - "spec": ">=1.2.1 <2.0.0", - "type": "range" + "escapedName": "bindings", + "rawSpec": "1.3.0", + "saveSpec": null, + "fetchSpec": "1.3.0" }, "_requiredBy": [ "/lame", "/osx-audio" ], - "_resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "_shasum": "14ad6113812d2d37d72e67b4cacb4bb726505f11", - "_shrinkwrap": null, - "_spec": "bindings@^1.2.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/lame", + "_resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz", + "_spec": "1.3.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", @@ -49,15 +36,7 @@ "bugs": { "url": "https://github.com/TooTallNate/node-bindings/issues" }, - "dependencies": {}, "description": "Helper module for loading your native module's .node file", - "devDependencies": {}, - "directories": {}, - "dist": { - "shasum": "14ad6113812d2d37d72e67b4cacb4bb726505f11", - "tarball": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz" - }, - "gitHead": "e404152ee27f8478ccbc7122ee051246e8e5ec02", "homepage": "https://github.com/TooTallNate/node-bindings", "keywords": [ "native", @@ -70,23 +49,10 @@ ], "license": "MIT", "main": "./bindings.js", - "maintainers": [ - { - "name": "TooTallNate", - "email": "nathan@tootallnate.net" - }, - { - "name": "tootallnate", - "email": "nathan@tootallnate.net" - } - ], "name": "bindings", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/TooTallNate/node-bindings.git" }, - "scripts": {}, - "version": "1.2.1" + "version": "1.3.0" } diff --git a/nodejs/node_modules/body-parser/HISTORY.md b/nodejs/node_modules/body-parser/HISTORY.md new file mode 100644 index 000000000..6ab747bb1 --- /dev/null +++ b/nodejs/node_modules/body-parser/HISTORY.md @@ -0,0 +1,568 @@ +1.18.2 / 2017-09-22 +=================== + + * deps: debug@2.6.9 + * perf: remove argument reassignment + +1.18.1 / 2017-09-12 +=================== + + * deps: content-type@~1.0.4 + - perf: remove argument reassignment + - perf: skip parameter parsing when no parameters + * deps: iconv-lite@0.4.19 + - Fix ISO-8859-1 regression + - Update Windows-1255 + * deps: qs@6.5.1 + - Fix parsing & compacting very deep objects + * deps: raw-body@2.3.2 + - deps: iconv-lite@0.4.19 + +1.18.0 / 2017-09-08 +=================== + + * Fix JSON strict violation error to match native parse error + * Include the `body` property on verify errors + * Include the `type` property on all generated errors + * Use `http-errors` to set status code on errors + * deps: bytes@3.0.0 + * deps: debug@2.6.8 + * deps: depd@~1.1.1 + - Remove unnecessary `Buffer` loading + * deps: http-errors@~1.6.2 + - deps: depd@1.1.1 + * deps: iconv-lite@0.4.18 + - Add support for React Native + - Add a warning if not loaded as utf-8 + - Fix CESU-8 decoding in Node.js 8 + - Improve speed of ISO-8859-1 encoding + * deps: qs@6.5.0 + * deps: raw-body@2.3.1 + - Use `http-errors` for standard emitted errors + - deps: bytes@3.0.0 + - deps: iconv-lite@0.4.18 + - perf: skip buffer decoding on overage chunk + * perf: prevent internal `throw` when missing charset + +1.17.2 / 2017-05-17 +=================== + + * deps: debug@2.6.7 + - Fix `DEBUG_MAX_ARRAY_LENGTH` + - deps: ms@2.0.0 + * deps: type-is@~1.6.15 + - deps: mime-types@~2.1.15 + +1.17.1 / 2017-03-06 +=================== + + * deps: qs@6.4.0 + - Fix regression parsing keys starting with `[` + +1.17.0 / 2017-03-01 +=================== + + * deps: http-errors@~1.6.1 + - Make `message` property enumerable for `HttpError`s + - deps: setprototypeof@1.0.3 + * deps: qs@6.3.1 + - Fix compacting nested arrays + +1.16.1 / 2017-02-10 +=================== + + * deps: debug@2.6.1 + - Fix deprecation messages in WebStorm and other editors + - Undeprecate `DEBUG_FD` set to `1` or `2` + +1.16.0 / 2017-01-17 +=================== + + * deps: debug@2.6.0 + - Allow colors in workers + - Deprecated `DEBUG_FD` environment variable + - Fix error when running under React Native + - Use same color for same namespace + - deps: ms@0.7.2 + * deps: http-errors@~1.5.1 + - deps: inherits@2.0.3 + - deps: setprototypeof@1.0.2 + - deps: statuses@'>= 1.3.1 < 2' + * deps: iconv-lite@0.4.15 + - Added encoding MS-31J + - Added encoding MS-932 + - Added encoding MS-936 + - Added encoding MS-949 + - Added encoding MS-950 + - Fix GBK/GB18030 handling of Euro character + * deps: qs@6.2.1 + - Fix array parsing from skipping empty values + * deps: raw-body@~2.2.0 + - deps: iconv-lite@0.4.15 + * deps: type-is@~1.6.14 + - deps: mime-types@~2.1.13 + +1.15.2 / 2016-06-19 +=================== + + * deps: bytes@2.4.0 + * deps: content-type@~1.0.2 + - perf: enable strict mode + * deps: http-errors@~1.5.0 + - Use `setprototypeof` module to replace `__proto__` setting + - deps: statuses@'>= 1.3.0 < 2' + - perf: enable strict mode + * deps: qs@6.2.0 + * deps: raw-body@~2.1.7 + - deps: bytes@2.4.0 + - perf: remove double-cleanup on happy path + * deps: type-is@~1.6.13 + - deps: mime-types@~2.1.11 + +1.15.1 / 2016-05-05 +=================== + + * deps: bytes@2.3.0 + - Drop partial bytes on all parsed units + - Fix parsing byte string that looks like hex + * deps: raw-body@~2.1.6 + - deps: bytes@2.3.0 + * deps: type-is@~1.6.12 + - deps: mime-types@~2.1.10 + +1.15.0 / 2016-02-10 +=================== + + * deps: http-errors@~1.4.0 + - Add `HttpError` export, for `err instanceof createError.HttpError` + - deps: inherits@2.0.1 + - deps: statuses@'>= 1.2.1 < 2' + * deps: qs@6.1.0 + * deps: type-is@~1.6.11 + - deps: mime-types@~2.1.9 + +1.14.2 / 2015-12-16 +=================== + + * deps: bytes@2.2.0 + * deps: iconv-lite@0.4.13 + * deps: qs@5.2.0 + * deps: raw-body@~2.1.5 + - deps: bytes@2.2.0 + - deps: iconv-lite@0.4.13 + * deps: type-is@~1.6.10 + - deps: mime-types@~2.1.8 + +1.14.1 / 2015-09-27 +=================== + + * Fix issue where invalid charset results in 400 when `verify` used + * deps: iconv-lite@0.4.12 + - Fix CESU-8 decoding in Node.js 4.x + * deps: raw-body@~2.1.4 + - Fix masking critical errors from `iconv-lite` + - deps: iconv-lite@0.4.12 + * deps: type-is@~1.6.9 + - deps: mime-types@~2.1.7 + +1.14.0 / 2015-09-16 +=================== + + * Fix JSON strict parse error to match syntax errors + * Provide static `require` analysis in `urlencoded` parser + * deps: depd@~1.1.0 + - Support web browser loading + * deps: qs@5.1.0 + * deps: raw-body@~2.1.3 + - Fix sync callback when attaching data listener causes sync read + * deps: type-is@~1.6.8 + - Fix type error when given invalid type to match against + - deps: mime-types@~2.1.6 + +1.13.3 / 2015-07-31 +=================== + + * deps: type-is@~1.6.6 + - deps: mime-types@~2.1.4 + +1.13.2 / 2015-07-05 +=================== + + * deps: iconv-lite@0.4.11 + * deps: qs@4.0.0 + - Fix dropping parameters like `hasOwnProperty` + - Fix user-visible incompatibilities from 3.1.0 + - Fix various parsing edge cases + * deps: raw-body@~2.1.2 + - Fix error stack traces to skip `makeError` + - deps: iconv-lite@0.4.11 + * deps: type-is@~1.6.4 + - deps: mime-types@~2.1.2 + - perf: enable strict mode + - perf: remove argument reassignment + +1.13.1 / 2015-06-16 +=================== + + * deps: qs@2.4.2 + - Downgraded from 3.1.0 because of user-visible incompatibilities + +1.13.0 / 2015-06-14 +=================== + + * Add `statusCode` property on `Error`s, in addition to `status` + * Change `type` default to `application/json` for JSON parser + * Change `type` default to `application/x-www-form-urlencoded` for urlencoded parser + * Provide static `require` analysis + * Use the `http-errors` module to generate errors + * deps: bytes@2.1.0 + - Slight optimizations + * deps: iconv-lite@0.4.10 + - The encoding UTF-16 without BOM now defaults to UTF-16LE when detection fails + - Leading BOM is now removed when decoding + * deps: on-finished@~2.3.0 + - Add defined behavior for HTTP `CONNECT` requests + - Add defined behavior for HTTP `Upgrade` requests + - deps: ee-first@1.1.1 + * deps: qs@3.1.0 + - Fix dropping parameters like `hasOwnProperty` + - Fix various parsing edge cases + - Parsed object now has `null` prototype + * deps: raw-body@~2.1.1 + - Use `unpipe` module for unpiping requests + - deps: iconv-lite@0.4.10 + * deps: type-is@~1.6.3 + - deps: mime-types@~2.1.1 + - perf: reduce try block size + - perf: remove bitwise operations + * perf: enable strict mode + * perf: remove argument reassignment + * perf: remove delete call + +1.12.4 / 2015-05-10 +=================== + + * deps: debug@~2.2.0 + * deps: qs@2.4.2 + - Fix allowing parameters like `constructor` + * deps: on-finished@~2.2.1 + * deps: raw-body@~2.0.1 + - Fix a false-positive when unpiping in Node.js 0.8 + - deps: bytes@2.0.1 + * deps: type-is@~1.6.2 + - deps: mime-types@~2.0.11 + +1.12.3 / 2015-04-15 +=================== + + * Slight efficiency improvement when not debugging + * deps: depd@~1.0.1 + * deps: iconv-lite@0.4.8 + - Add encoding alias UNICODE-1-1-UTF-7 + * deps: raw-body@1.3.4 + - Fix hanging callback if request aborts during read + - deps: iconv-lite@0.4.8 + +1.12.2 / 2015-03-16 +=================== + + * deps: qs@2.4.1 + - Fix error when parameter `hasOwnProperty` is present + +1.12.1 / 2015-03-15 +=================== + + * deps: debug@~2.1.3 + - Fix high intensity foreground color for bold + - deps: ms@0.7.0 + * deps: type-is@~1.6.1 + - deps: mime-types@~2.0.10 + +1.12.0 / 2015-02-13 +=================== + + * add `debug` messages + * accept a function for the `type` option + * use `content-type` to parse `Content-Type` headers + * deps: iconv-lite@0.4.7 + - Gracefully support enumerables on `Object.prototype` + * deps: raw-body@1.3.3 + - deps: iconv-lite@0.4.7 + * deps: type-is@~1.6.0 + - fix argument reassignment + - fix false-positives in `hasBody` `Transfer-Encoding` check + - support wildcard for both type and subtype (`*/*`) + - deps: mime-types@~2.0.9 + +1.11.0 / 2015-01-30 +=================== + + * make internal `extended: true` depth limit infinity + * deps: type-is@~1.5.6 + - deps: mime-types@~2.0.8 + +1.10.2 / 2015-01-20 +=================== + + * deps: iconv-lite@0.4.6 + - Fix rare aliases of single-byte encodings + * deps: raw-body@1.3.2 + - deps: iconv-lite@0.4.6 + +1.10.1 / 2015-01-01 +=================== + + * deps: on-finished@~2.2.0 + * deps: type-is@~1.5.5 + - deps: mime-types@~2.0.7 + +1.10.0 / 2014-12-02 +=================== + + * make internal `extended: true` array limit dynamic + +1.9.3 / 2014-11-21 +================== + + * deps: iconv-lite@0.4.5 + - Fix Windows-31J and X-SJIS encoding support + * deps: qs@2.3.3 + - Fix `arrayLimit` behavior + * deps: raw-body@1.3.1 + - deps: iconv-lite@0.4.5 + * deps: type-is@~1.5.3 + - deps: mime-types@~2.0.3 + +1.9.2 / 2014-10-27 +================== + + * deps: qs@2.3.2 + - Fix parsing of mixed objects and values + +1.9.1 / 2014-10-22 +================== + + * deps: on-finished@~2.1.1 + - Fix handling of pipelined requests + * deps: qs@2.3.0 + - Fix parsing of mixed implicit and explicit arrays + * deps: type-is@~1.5.2 + - deps: mime-types@~2.0.2 + +1.9.0 / 2014-09-24 +================== + + * include the charset in "unsupported charset" error message + * include the encoding in "unsupported content encoding" error message + * deps: depd@~1.0.0 + +1.8.4 / 2014-09-23 +================== + + * fix content encoding to be case-insensitive + +1.8.3 / 2014-09-19 +================== + + * deps: qs@2.2.4 + - Fix issue with object keys starting with numbers truncated + +1.8.2 / 2014-09-15 +================== + + * deps: depd@0.4.5 + +1.8.1 / 2014-09-07 +================== + + * deps: media-typer@0.3.0 + * deps: type-is@~1.5.1 + +1.8.0 / 2014-09-05 +================== + + * make empty-body-handling consistent between chunked requests + - empty `json` produces `{}` + - empty `raw` produces `new Buffer(0)` + - empty `text` produces `''` + - empty `urlencoded` produces `{}` + * deps: qs@2.2.3 + - Fix issue where first empty value in array is discarded + * deps: type-is@~1.5.0 + - fix `hasbody` to be true for `content-length: 0` + +1.7.0 / 2014-09-01 +================== + + * add `parameterLimit` option to `urlencoded` parser + * change `urlencoded` extended array limit to 100 + * respond with 413 when over `parameterLimit` in `urlencoded` + +1.6.7 / 2014-08-29 +================== + + * deps: qs@2.2.2 + - Remove unnecessary cloning + +1.6.6 / 2014-08-27 +================== + + * deps: qs@2.2.0 + - Array parsing fix + - Performance improvements + +1.6.5 / 2014-08-16 +================== + + * deps: on-finished@2.1.0 + +1.6.4 / 2014-08-14 +================== + + * deps: qs@1.2.2 + +1.6.3 / 2014-08-10 +================== + + * deps: qs@1.2.1 + +1.6.2 / 2014-08-07 +================== + + * deps: qs@1.2.0 + - Fix parsing array of objects + +1.6.1 / 2014-08-06 +================== + + * deps: qs@1.1.0 + - Accept urlencoded square brackets + - Accept empty values in implicit array notation + +1.6.0 / 2014-08-05 +================== + + * deps: qs@1.0.2 + - Complete rewrite + - Limits array length to 20 + - Limits object depth to 5 + - Limits parameters to 1,000 + +1.5.2 / 2014-07-27 +================== + + * deps: depd@0.4.4 + - Work-around v8 generating empty stack traces + +1.5.1 / 2014-07-26 +================== + + * deps: depd@0.4.3 + - Fix exception when global `Error.stackTraceLimit` is too low + +1.5.0 / 2014-07-20 +================== + + * deps: depd@0.4.2 + - Add `TRACE_DEPRECATION` environment variable + - Remove non-standard grey color from color output + - Support `--no-deprecation` argument + - Support `--trace-deprecation` argument + * deps: iconv-lite@0.4.4 + - Added encoding UTF-7 + * deps: raw-body@1.3.0 + - deps: iconv-lite@0.4.4 + - Added encoding UTF-7 + - Fix `Cannot switch to old mode now` error on Node.js 0.10+ + * deps: type-is@~1.3.2 + +1.4.3 / 2014-06-19 +================== + + * deps: type-is@1.3.1 + - fix global variable leak + +1.4.2 / 2014-06-19 +================== + + * deps: type-is@1.3.0 + - improve type parsing + +1.4.1 / 2014-06-19 +================== + + * fix urlencoded extended deprecation message + +1.4.0 / 2014-06-19 +================== + + * add `text` parser + * add `raw` parser + * check accepted charset in content-type (accepts utf-8) + * check accepted encoding in content-encoding (accepts identity) + * deprecate `bodyParser()` middleware; use `.json()` and `.urlencoded()` as needed + * deprecate `urlencoded()` without provided `extended` option + * lazy-load urlencoded parsers + * parsers split into files for reduced mem usage + * support gzip and deflate bodies + - set `inflate: false` to turn off + * deps: raw-body@1.2.2 + - Support all encodings from `iconv-lite` + +1.3.1 / 2014-06-11 +================== + + * deps: type-is@1.2.1 + - Switch dependency from mime to mime-types@1.0.0 + +1.3.0 / 2014-05-31 +================== + + * add `extended` option to urlencoded parser + +1.2.2 / 2014-05-27 +================== + + * deps: raw-body@1.1.6 + - assert stream encoding on node.js 0.8 + - assert stream encoding on node.js < 0.10.6 + - deps: bytes@1 + +1.2.1 / 2014-05-26 +================== + + * invoke `next(err)` after request fully read + - prevents hung responses and socket hang ups + +1.2.0 / 2014-05-11 +================== + + * add `verify` option + * deps: type-is@1.2.0 + - support suffix matching + +1.1.2 / 2014-05-11 +================== + + * improve json parser speed + +1.1.1 / 2014-05-11 +================== + + * fix repeated limit parsing with every request + +1.1.0 / 2014-05-10 +================== + + * add `type` option + * deps: pin for safety and consistency + +1.0.2 / 2014-04-14 +================== + + * use `type-is` module + +1.0.1 / 2014-03-20 +================== + + * lower default limits to 100kb diff --git a/nodejs/node_modules/body-parser/LICENSE b/nodejs/node_modules/body-parser/LICENSE new file mode 100644 index 000000000..386b7b694 --- /dev/null +++ b/nodejs/node_modules/body-parser/LICENSE @@ -0,0 +1,23 @@ +(The MIT License) + +Copyright (c) 2014 Jonathan Ong +Copyright (c) 2014-2015 Douglas Christopher Wilson + +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/nodejs/node_modules/body-parser/README.md b/nodejs/node_modules/body-parser/README.md new file mode 100644 index 000000000..62221e473 --- /dev/null +++ b/nodejs/node_modules/body-parser/README.md @@ -0,0 +1,438 @@ +# body-parser + +[![NPM Version][npm-image]][npm-url] +[![NPM Downloads][downloads-image]][downloads-url] +[![Build Status][travis-image]][travis-url] +[![Test Coverage][coveralls-image]][coveralls-url] +[![Gratipay][gratipay-image]][gratipay-url] + +Node.js body parsing middleware. + +Parse incoming request bodies in a middleware before your handlers, available +under the `req.body` property. + +[Learn about the anatomy of an HTTP transaction in Node.js](https://nodejs.org/en/docs/guides/anatomy-of-an-http-transaction/). + +_This does not handle multipart bodies_, due to their complex and typically +large nature. For multipart bodies, you may be interested in the following +modules: + + * [busboy](https://www.npmjs.org/package/busboy#readme) and + [connect-busboy](https://www.npmjs.org/package/connect-busboy#readme) + * [multiparty](https://www.npmjs.org/package/multiparty#readme) and + [connect-multiparty](https://www.npmjs.org/package/connect-multiparty#readme) + * [formidable](https://www.npmjs.org/package/formidable#readme) + * [multer](https://www.npmjs.org/package/multer#readme) + +This module provides the following parsers: + + * [JSON body parser](#bodyparserjsonoptions) + * [Raw body parser](#bodyparserrawoptions) + * [Text body parser](#bodyparsertextoptions) + * [URL-encoded form body parser](#bodyparserurlencodedoptions) + +Other body parsers you might be interested in: + +- [body](https://www.npmjs.org/package/body#readme) +- [co-body](https://www.npmjs.org/package/co-body#readme) + +## Installation + +```sh +$ npm install body-parser +``` + +## API + + + +```js +var bodyParser = require('body-parser') +``` + +The `bodyParser` object exposes various factories to create middlewares. All +middlewares will populate the `req.body` property with the parsed body when +the `Content-Type` request header matches the `type` option, or an empty +object (`{}`) if there was no body to parse, the `Content-Type` was not matched, +or an error occurred. + +The various errors returned by this module are described in the +[errors section](#errors). + +### bodyParser.json([options]) + +Returns middleware that only parses `json` and only looks at requests where +the `Content-Type` header matches the `type` option. This parser accepts any +Unicode encoding of the body and supports automatic inflation of `gzip` and +`deflate` encodings. + +A new `body` object containing the parsed data is populated on the `request` +object after the middleware (i.e. `req.body`). + +#### Options + +The `json` function takes an optional `options` object that may contain any of +the following keys: + +##### inflate + +When set to `true`, then deflated (compressed) bodies will be inflated; when +`false`, deflated bodies are rejected. Defaults to `true`. + +##### limit + +Controls the maximum request body size. If this is a number, then the value +specifies the number of bytes; if it is a string, the value is passed to the +[bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults +to `'100kb'`. + +##### reviver + +The `reviver` option is passed directly to `JSON.parse` as the second +argument. You can find more information on this argument +[in the MDN documentation about JSON.parse](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse#Example.3A_Using_the_reviver_parameter). + +##### strict + +When set to `true`, will only accept arrays and objects; when `false` will +accept anything `JSON.parse` accepts. Defaults to `true`. + +##### type + +The `type` option is used to determine what media type the middleware will +parse. This option can be a function or a string. If a string, `type` option +is passed directly to the [type-is](https://www.npmjs.org/package/type-is#readme) +library and this can be an extension name (like `json`), a mime type (like +`application/json`), or a mime type with a wildcard (like `*/*` or `*/json`). +If a function, the `type` option is called as `fn(req)` and the request is +parsed if it returns a truthy value. Defaults to `application/json`. + +##### verify + +The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`, +where `buf` is a `Buffer` of the raw request body and `encoding` is the +encoding of the request. The parsing can be aborted by throwing an error. + +### bodyParser.raw([options]) + +Returns middleware that parses all bodies as a `Buffer` and only looks at +requests where the `Content-Type` header matches the `type` option. This +parser supports automatic inflation of `gzip` and `deflate` encodings. + +A new `body` object containing the parsed data is populated on the `request` +object after the middleware (i.e. `req.body`). This will be a `Buffer` object +of the body. + +#### Options + +The `raw` function takes an optional `options` object that may contain any of +the following keys: + +##### inflate + +When set to `true`, then deflated (compressed) bodies will be inflated; when +`false`, deflated bodies are rejected. Defaults to `true`. + +##### limit + +Controls the maximum request body size. If this is a number, then the value +specifies the number of bytes; if it is a string, the value is passed to the +[bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults +to `'100kb'`. + +##### type + +The `type` option is used to determine what media type the middleware will +parse. This option can be a function or a string. If a string, `type` option +is passed directly to the [type-is](https://www.npmjs.org/package/type-is#readme) +library and this can be an extension name (like `bin`), a mime type (like +`application/octet-stream`), or a mime type with a wildcard (like `*/*` or +`application/*`). If a function, the `type` option is called as `fn(req)` +and the request is parsed if it returns a truthy value. Defaults to +`application/octet-stream`. + +##### verify + +The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`, +where `buf` is a `Buffer` of the raw request body and `encoding` is the +encoding of the request. The parsing can be aborted by throwing an error. + +### bodyParser.text([options]) + +Returns middleware that parses all bodies as a string and only looks at +requests where the `Content-Type` header matches the `type` option. This +parser supports automatic inflation of `gzip` and `deflate` encodings. + +A new `body` string containing the parsed data is populated on the `request` +object after the middleware (i.e. `req.body`). This will be a string of the +body. + +#### Options + +The `text` function takes an optional `options` object that may contain any of +the following keys: + +##### defaultCharset + +Specify the default character set for the text content if the charset is not +specified in the `Content-Type` header of the request. Defaults to `utf-8`. + +##### inflate + +When set to `true`, then deflated (compressed) bodies will be inflated; when +`false`, deflated bodies are rejected. Defaults to `true`. + +##### limit + +Controls the maximum request body size. If this is a number, then the value +specifies the number of bytes; if it is a string, the value is passed to the +[bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults +to `'100kb'`. + +##### type + +The `type` option is used to determine what media type the middleware will +parse. This option can be a function or a string. If a string, `type` option +is passed directly to the [type-is](https://www.npmjs.org/package/type-is#readme) +library and this can be an extension name (like `txt`), a mime type (like +`text/plain`), or a mime type with a wildcard (like `*/*` or `text/*`). +If a function, the `type` option is called as `fn(req)` and the request is +parsed if it returns a truthy value. Defaults to `text/plain`. + +##### verify + +The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`, +where `buf` is a `Buffer` of the raw request body and `encoding` is the +encoding of the request. The parsing can be aborted by throwing an error. + +### bodyParser.urlencoded([options]) + +Returns middleware that only parses `urlencoded` bodies and only looks at +requests where the `Content-Type` header matches the `type` option. This +parser accepts only UTF-8 encoding of the body and supports automatic +inflation of `gzip` and `deflate` encodings. + +A new `body` object containing the parsed data is populated on the `request` +object after the middleware (i.e. `req.body`). This object will contain +key-value pairs, where the value can be a string or array (when `extended` is +`false`), or any type (when `extended` is `true`). + +#### Options + +The `urlencoded` function takes an optional `options` object that may contain +any of the following keys: + +##### extended + +The `extended` option allows to choose between parsing the URL-encoded data +with the `querystring` library (when `false`) or the `qs` library (when +`true`). The "extended" syntax allows for rich objects and arrays to be +encoded into the URL-encoded format, allowing for a JSON-like experience +with URL-encoded. For more information, please +[see the qs library](https://www.npmjs.org/package/qs#readme). + +Defaults to `true`, but using the default has been deprecated. Please +research into the difference between `qs` and `querystring` and choose the +appropriate setting. + +##### inflate + +When set to `true`, then deflated (compressed) bodies will be inflated; when +`false`, deflated bodies are rejected. Defaults to `true`. + +##### limit + +Controls the maximum request body size. If this is a number, then the value +specifies the number of bytes; if it is a string, the value is passed to the +[bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults +to `'100kb'`. + +##### parameterLimit + +The `parameterLimit` option controls the maximum number of parameters that +are allowed in the URL-encoded data. If a request contains more parameters +than this value, a 413 will be returned to the client. Defaults to `1000`. + +##### type + +The `type` option is used to determine what media type the middleware will +parse. This option can be a function or a string. If a string, `type` option +is passed directly to the [type-is](https://www.npmjs.org/package/type-is#readme) +library and this can be an extension name (like `urlencoded`), a mime type (like +`application/x-www-form-urlencoded`), or a mime type with a wildcard (like +`*/x-www-form-urlencoded`). If a function, the `type` option is called as +`fn(req)` and the request is parsed if it returns a truthy value. Defaults +to `application/x-www-form-urlencoded`. + +##### verify + +The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`, +where `buf` is a `Buffer` of the raw request body and `encoding` is the +encoding of the request. The parsing can be aborted by throwing an error. + +## Errors + +The middlewares provided by this module create errors depending on the error +condition during parsing. The errors will typically have a `status`/`statusCode` +property that contains the suggested HTTP response code, an `expose` property +to determine if the `message` property should be displayed to the client, a +`type` property to determine the type of error without matching against the +`message`, and a `body` property containing the read body, if available. + +The following are the common errors emitted, though any error can come through +for various reasons. + +### content encoding unsupported + +This error will occur when the request had a `Content-Encoding` header that +contained an encoding but the "inflation" option was set to `false`. The +`status` property is set to `415`, the `type` property is set to +`'encoding.unsupported'`, and the `charset` property will be set to the +encoding that is unsupported. + +### request aborted + +This error will occur when the request is aborted by the client before reading +the body has finished. The `received` property will be set to the number of +bytes received before the request was aborted and the `expected` property is +set to the number of expected bytes. The `status` property is set to `400` +and `type` property is set to `'request.aborted'`. + +### request entity too large + +This error will occur when the request body's size is larger than the "limit" +option. The `limit` property will be set to the byte limit and the `length` +property will be set to the request body's length. The `status` property is +set to `413` and the `type` property is set to `'entity.too.large'`. + +### request size did not match content length + +This error will occur when the request's length did not match the length from +the `Content-Length` header. This typically occurs when the request is malformed, +typically when the `Content-Length` header was calculated based on characters +instead of bytes. The `status` property is set to `400` and the `type` property +is set to `'request.size.invalid'`. + +### stream encoding should not be set + +This error will occur when something called the `req.setEncoding` method prior +to this middleware. This module operates directly on bytes only and you cannot +call `req.setEncoding` when using this module. The `status` property is set to +`500` and the `type` property is set to `'stream.encoding.set'`. + +### too many parameters + +This error will occur when the content of the request exceeds the configured +`parameterLimit` for the `urlencoded` parser. The `status` property is set to +`413` and the `type` property is set to `'parameters.too.many'`. + +### unsupported charset "BOGUS" + +This error will occur when the request had a charset parameter in the +`Content-Type` header, but the `iconv-lite` module does not support it OR the +parser does not support it. The charset is contained in the message as well +as in the `charset` property. The `status` property is set to `415`, the +`type` property is set to `'charset.unsupported'`, and the `charset` property +is set to the charset that is unsupported. + +### unsupported content encoding "bogus" + +This error will occur when the request had a `Content-Encoding` header that +contained an unsupported encoding. The encoding is contained in the message +as well as in the `encoding` property. The `status` property is set to `415`, +the `type` property is set to `'encoding.unsupported'`, and the `encoding` +property is set to the encoding that is unsupported. + +## Examples + +### Express/Connect top-level generic + +This example demonstrates adding a generic JSON and URL-encoded parser as a +top-level middleware, which will parse the bodies of all incoming requests. +This is the simplest setup. + +```js +var express = require('express') +var bodyParser = require('body-parser') + +var app = express() + +// parse application/x-www-form-urlencoded +app.use(bodyParser.urlencoded({ extended: false })) + +// parse application/json +app.use(bodyParser.json()) + +app.use(function (req, res) { + res.setHeader('Content-Type', 'text/plain') + res.write('you posted:\n') + res.end(JSON.stringify(req.body, null, 2)) +}) +``` + +### Express route-specific + +This example demonstrates adding body parsers specifically to the routes that +need them. In general, this is the most recommended way to use body-parser with +Express. + +```js +var express = require('express') +var bodyParser = require('body-parser') + +var app = express() + +// create application/json parser +var jsonParser = bodyParser.json() + +// create application/x-www-form-urlencoded parser +var urlencodedParser = bodyParser.urlencoded({ extended: false }) + +// POST /login gets urlencoded bodies +app.post('/login', urlencodedParser, function (req, res) { + if (!req.body) return res.sendStatus(400) + res.send('welcome, ' + req.body.username) +}) + +// POST /api/users gets JSON bodies +app.post('/api/users', jsonParser, function (req, res) { + if (!req.body) return res.sendStatus(400) + // create user in req.body +}) +``` + +### Change accepted type for parsers + +All the parsers accept a `type` option which allows you to change the +`Content-Type` that the middleware will parse. + +```js +var express = require('express') +var bodyParser = require('body-parser') + +var app = express() + +// parse various different custom JSON types as JSON +app.use(bodyParser.json({ type: 'application/*+json' })) + +// parse some custom thing into a Buffer +app.use(bodyParser.raw({ type: 'application/vnd.custom-type' })) + +// parse an HTML body into a string +app.use(bodyParser.text({ type: 'text/html' })) +``` + +## License + +[MIT](LICENSE) + +[npm-image]: https://img.shields.io/npm/v/body-parser.svg +[npm-url]: https://npmjs.org/package/body-parser +[travis-image]: https://img.shields.io/travis/expressjs/body-parser/master.svg +[travis-url]: https://travis-ci.org/expressjs/body-parser +[coveralls-image]: https://img.shields.io/coveralls/expressjs/body-parser/master.svg +[coveralls-url]: https://coveralls.io/r/expressjs/body-parser?branch=master +[downloads-image]: https://img.shields.io/npm/dm/body-parser.svg +[downloads-url]: https://npmjs.org/package/body-parser +[gratipay-image]: https://img.shields.io/gratipay/dougwilson.svg +[gratipay-url]: https://www.gratipay.com/dougwilson/ diff --git a/nodejs/node_modules/body-parser/index.js b/nodejs/node_modules/body-parser/index.js new file mode 100644 index 000000000..93c3a1fff --- /dev/null +++ b/nodejs/node_modules/body-parser/index.js @@ -0,0 +1,157 @@ +/*! + * body-parser + * Copyright(c) 2014-2015 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict' + +/** + * Module dependencies. + * @private + */ + +var deprecate = require('depd')('body-parser') + +/** + * Cache of loaded parsers. + * @private + */ + +var parsers = Object.create(null) + +/** + * @typedef Parsers + * @type {function} + * @property {function} json + * @property {function} raw + * @property {function} text + * @property {function} urlencoded + */ + +/** + * Module exports. + * @type {Parsers} + */ + +exports = module.exports = deprecate.function(bodyParser, + 'bodyParser: use individual json/urlencoded middlewares') + +/** + * JSON parser. + * @public + */ + +Object.defineProperty(exports, 'json', { + configurable: true, + enumerable: true, + get: createParserGetter('json') +}) + +/** + * Raw parser. + * @public + */ + +Object.defineProperty(exports, 'raw', { + configurable: true, + enumerable: true, + get: createParserGetter('raw') +}) + +/** + * Text parser. + * @public + */ + +Object.defineProperty(exports, 'text', { + configurable: true, + enumerable: true, + get: createParserGetter('text') +}) + +/** + * URL-encoded parser. + * @public + */ + +Object.defineProperty(exports, 'urlencoded', { + configurable: true, + enumerable: true, + get: createParserGetter('urlencoded') +}) + +/** + * Create a middleware to parse json and urlencoded bodies. + * + * @param {object} [options] + * @return {function} + * @deprecated + * @public + */ + +function bodyParser (options) { + var opts = {} + + // exclude type option + if (options) { + for (var prop in options) { + if (prop !== 'type') { + opts[prop] = options[prop] + } + } + } + + var _urlencoded = exports.urlencoded(opts) + var _json = exports.json(opts) + + return function bodyParser (req, res, next) { + _json(req, res, function (err) { + if (err) return next(err) + _urlencoded(req, res, next) + }) + } +} + +/** + * Create a getter for loading a parser. + * @private + */ + +function createParserGetter (name) { + return function get () { + return loadParser(name) + } +} + +/** + * Load a parser module. + * @private + */ + +function loadParser (parserName) { + var parser = parsers[parserName] + + if (parser !== undefined) { + return parser + } + + // this uses a switch for static require analysis + switch (parserName) { + case 'json': + parser = require('./lib/types/json') + break + case 'raw': + parser = require('./lib/types/raw') + break + case 'text': + parser = require('./lib/types/text') + break + case 'urlencoded': + parser = require('./lib/types/urlencoded') + break + } + + // store to prevent invoking require() + return (parsers[parserName] = parser) +} diff --git a/nodejs/node_modules/body-parser/lib/read.js b/nodejs/node_modules/body-parser/lib/read.js new file mode 100644 index 000000000..c10260958 --- /dev/null +++ b/nodejs/node_modules/body-parser/lib/read.js @@ -0,0 +1,181 @@ +/*! + * body-parser + * Copyright(c) 2014-2015 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict' + +/** + * Module dependencies. + * @private + */ + +var createError = require('http-errors') +var getBody = require('raw-body') +var iconv = require('iconv-lite') +var onFinished = require('on-finished') +var zlib = require('zlib') + +/** + * Module exports. + */ + +module.exports = read + +/** + * Read a request into a buffer and parse. + * + * @param {object} req + * @param {object} res + * @param {function} next + * @param {function} parse + * @param {function} debug + * @param {object} options + * @private + */ + +function read (req, res, next, parse, debug, options) { + var length + var opts = options + var stream + + // flag as parsed + req._body = true + + // read options + var encoding = opts.encoding !== null + ? opts.encoding + : null + var verify = opts.verify + + try { + // get the content stream + stream = contentstream(req, debug, opts.inflate) + length = stream.length + stream.length = undefined + } catch (err) { + return next(err) + } + + // set raw-body options + opts.length = length + opts.encoding = verify + ? null + : encoding + + // assert charset is supported + if (opts.encoding === null && encoding !== null && !iconv.encodingExists(encoding)) { + return next(createError(415, 'unsupported charset "' + encoding.toUpperCase() + '"', { + charset: encoding.toLowerCase(), + type: 'charset.unsupported' + })) + } + + // read body + debug('read body') + getBody(stream, opts, function (error, body) { + if (error) { + var _error + + if (error.type === 'encoding.unsupported') { + // echo back charset + _error = createError(415, 'unsupported charset "' + encoding.toUpperCase() + '"', { + charset: encoding.toLowerCase(), + type: 'charset.unsupported' + }) + } else { + // set status code on error + _error = createError(400, error) + } + + // read off entire request + stream.resume() + onFinished(req, function onfinished () { + next(createError(400, _error)) + }) + return + } + + // verify + if (verify) { + try { + debug('verify body') + verify(req, res, body, encoding) + } catch (err) { + next(createError(403, err, { + body: body, + type: err.type || 'entity.verify.failed' + })) + return + } + } + + // parse + var str = body + try { + debug('parse body') + str = typeof body !== 'string' && encoding !== null + ? iconv.decode(body, encoding) + : body + req.body = parse(str) + } catch (err) { + next(createError(400, err, { + body: str, + type: err.type || 'entity.parse.failed' + })) + return + } + + next() + }) +} + +/** + * Get the content stream of the request. + * + * @param {object} req + * @param {function} debug + * @param {boolean} [inflate=true] + * @return {object} + * @api private + */ + +function contentstream (req, debug, inflate) { + var encoding = (req.headers['content-encoding'] || 'identity').toLowerCase() + var length = req.headers['content-length'] + var stream + + debug('content-encoding "%s"', encoding) + + if (inflate === false && encoding !== 'identity') { + throw createError(415, 'content encoding unsupported', { + encoding: encoding, + type: 'encoding.unsupported' + }) + } + + switch (encoding) { + case 'deflate': + stream = zlib.createInflate() + debug('inflate body') + req.pipe(stream) + break + case 'gzip': + stream = zlib.createGunzip() + debug('gunzip body') + req.pipe(stream) + break + case 'identity': + stream = req + stream.length = length + break + default: + throw createError(415, 'unsupported content encoding "' + encoding + '"', { + encoding: encoding, + type: 'encoding.unsupported' + }) + } + + return stream +} diff --git a/nodejs/node_modules/body-parser/lib/types/json.js b/nodejs/node_modules/body-parser/lib/types/json.js new file mode 100644 index 000000000..a7bc838cd --- /dev/null +++ b/nodejs/node_modules/body-parser/lib/types/json.js @@ -0,0 +1,232 @@ +/*! + * body-parser + * Copyright(c) 2014 Jonathan Ong + * Copyright(c) 2014-2015 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict' + +/** + * Module dependencies. + * @private + */ + +var bytes = require('bytes') +var contentType = require('content-type') +var createError = require('http-errors') +var debug = require('debug')('body-parser:json') +var read = require('../read') +var typeis = require('type-is') + +/** + * Module exports. + */ + +module.exports = json + +/** + * RegExp to match the first non-space in a string. + * + * Allowed whitespace is defined in RFC 7159: + * + * ws = *( + * %x20 / ; Space + * %x09 / ; Horizontal tab + * %x0A / ; Line feed or New line + * %x0D ) ; Carriage return + */ + +var FIRST_CHAR_REGEXP = /^[\x20\x09\x0a\x0d]*(.)/ // eslint-disable-line no-control-regex + +/** + * Create a middleware to parse JSON bodies. + * + * @param {object} [options] + * @return {function} + * @public + */ + +function json (options) { + var opts = options || {} + + var limit = typeof opts.limit !== 'number' + ? bytes.parse(opts.limit || '100kb') + : opts.limit + var inflate = opts.inflate !== false + var reviver = opts.reviver + var strict = opts.strict !== false + var type = opts.type || 'application/json' + var verify = opts.verify || false + + if (verify !== false && typeof verify !== 'function') { + throw new TypeError('option verify must be function') + } + + // create the appropriate type checking function + var shouldParse = typeof type !== 'function' + ? typeChecker(type) + : type + + function parse (body) { + if (body.length === 0) { + // special-case empty json body, as it's a common client-side mistake + // TODO: maybe make this configurable or part of "strict" option + return {} + } + + if (strict) { + var first = firstchar(body) + + if (first !== '{' && first !== '[') { + debug('strict violation') + throw createStrictSyntaxError(body, first) + } + } + + try { + debug('parse json') + return JSON.parse(body, reviver) + } catch (e) { + throw normalizeJsonSyntaxError(e, { + stack: e.stack + }) + } + } + + return function jsonParser (req, res, next) { + if (req._body) { + debug('body already parsed') + next() + return + } + + req.body = req.body || {} + + // skip requests without bodies + if (!typeis.hasBody(req)) { + debug('skip empty body') + next() + return + } + + debug('content-type %j', req.headers['content-type']) + + // determine if request should be parsed + if (!shouldParse(req)) { + debug('skip parsing') + next() + return + } + + // assert charset per RFC 7159 sec 8.1 + var charset = getCharset(req) || 'utf-8' + if (charset.substr(0, 4) !== 'utf-') { + debug('invalid charset') + next(createError(415, 'unsupported charset "' + charset.toUpperCase() + '"', { + charset: charset, + type: 'charset.unsupported' + })) + return + } + + // read + read(req, res, next, parse, debug, { + encoding: charset, + inflate: inflate, + limit: limit, + verify: verify + }) + } +} + +/** + * Create strict violation syntax error matching native error. + * + * @param {string} str + * @param {string} char + * @return {Error} + * @private + */ + +function createStrictSyntaxError (str, char) { + var index = str.indexOf(char) + var partial = str.substring(0, index) + '#' + + try { + JSON.parse(partial); /* istanbul ignore next */ throw new SyntaxError('strict violation') + } catch (e) { + return normalizeJsonSyntaxError(e, { + message: e.message.replace('#', char), + stack: e.stack + }) + } +} + +/** + * Get the first non-whitespace character in a string. + * + * @param {string} str + * @return {function} + * @private + */ + +function firstchar (str) { + return FIRST_CHAR_REGEXP.exec(str)[1] +} + +/** + * Get the charset of a request. + * + * @param {object} req + * @api private + */ + +function getCharset (req) { + try { + return (contentType.parse(req).parameters.charset || '').toLowerCase() + } catch (e) { + return undefined + } +} + +/** + * Normalize a SyntaxError for JSON.parse. + * + * @param {SyntaxError} error + * @param {object} obj + * @return {SyntaxError} + */ + +function normalizeJsonSyntaxError (error, obj) { + var keys = Object.getOwnPropertyNames(error) + + for (var i = 0; i < keys.length; i++) { + var key = keys[i] + if (key !== 'stack' && key !== 'message') { + delete error[key] + } + } + + var props = Object.keys(obj) + + for (var j = 0; j < props.length; j++) { + var prop = props[j] + error[prop] = obj[prop] + } + + return error +} + +/** + * Get the simple type checker. + * + * @param {string} type + * @return {function} + */ + +function typeChecker (type) { + return function checkType (req) { + return Boolean(typeis(req, type)) + } +} diff --git a/nodejs/node_modules/body-parser/lib/types/raw.js b/nodejs/node_modules/body-parser/lib/types/raw.js new file mode 100644 index 000000000..f5d1b6747 --- /dev/null +++ b/nodejs/node_modules/body-parser/lib/types/raw.js @@ -0,0 +1,101 @@ +/*! + * body-parser + * Copyright(c) 2014-2015 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict' + +/** + * Module dependencies. + */ + +var bytes = require('bytes') +var debug = require('debug')('body-parser:raw') +var read = require('../read') +var typeis = require('type-is') + +/** + * Module exports. + */ + +module.exports = raw + +/** + * Create a middleware to parse raw bodies. + * + * @param {object} [options] + * @return {function} + * @api public + */ + +function raw (options) { + var opts = options || {} + + var inflate = opts.inflate !== false + var limit = typeof opts.limit !== 'number' + ? bytes.parse(opts.limit || '100kb') + : opts.limit + var type = opts.type || 'application/octet-stream' + var verify = opts.verify || false + + if (verify !== false && typeof verify !== 'function') { + throw new TypeError('option verify must be function') + } + + // create the appropriate type checking function + var shouldParse = typeof type !== 'function' + ? typeChecker(type) + : type + + function parse (buf) { + return buf + } + + return function rawParser (req, res, next) { + if (req._body) { + debug('body already parsed') + next() + return + } + + req.body = req.body || {} + + // skip requests without bodies + if (!typeis.hasBody(req)) { + debug('skip empty body') + next() + return + } + + debug('content-type %j', req.headers['content-type']) + + // determine if request should be parsed + if (!shouldParse(req)) { + debug('skip parsing') + next() + return + } + + // read + read(req, res, next, parse, debug, { + encoding: null, + inflate: inflate, + limit: limit, + verify: verify + }) + } +} + +/** + * Get the simple type checker. + * + * @param {string} type + * @return {function} + */ + +function typeChecker (type) { + return function checkType (req) { + return Boolean(typeis(req, type)) + } +} diff --git a/nodejs/node_modules/body-parser/lib/types/text.js b/nodejs/node_modules/body-parser/lib/types/text.js new file mode 100644 index 000000000..083a00908 --- /dev/null +++ b/nodejs/node_modules/body-parser/lib/types/text.js @@ -0,0 +1,121 @@ +/*! + * body-parser + * Copyright(c) 2014-2015 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict' + +/** + * Module dependencies. + */ + +var bytes = require('bytes') +var contentType = require('content-type') +var debug = require('debug')('body-parser:text') +var read = require('../read') +var typeis = require('type-is') + +/** + * Module exports. + */ + +module.exports = text + +/** + * Create a middleware to parse text bodies. + * + * @param {object} [options] + * @return {function} + * @api public + */ + +function text (options) { + var opts = options || {} + + var defaultCharset = opts.defaultCharset || 'utf-8' + var inflate = opts.inflate !== false + var limit = typeof opts.limit !== 'number' + ? bytes.parse(opts.limit || '100kb') + : opts.limit + var type = opts.type || 'text/plain' + var verify = opts.verify || false + + if (verify !== false && typeof verify !== 'function') { + throw new TypeError('option verify must be function') + } + + // create the appropriate type checking function + var shouldParse = typeof type !== 'function' + ? typeChecker(type) + : type + + function parse (buf) { + return buf + } + + return function textParser (req, res, next) { + if (req._body) { + debug('body already parsed') + next() + return + } + + req.body = req.body || {} + + // skip requests without bodies + if (!typeis.hasBody(req)) { + debug('skip empty body') + next() + return + } + + debug('content-type %j', req.headers['content-type']) + + // determine if request should be parsed + if (!shouldParse(req)) { + debug('skip parsing') + next() + return + } + + // get charset + var charset = getCharset(req) || defaultCharset + + // read + read(req, res, next, parse, debug, { + encoding: charset, + inflate: inflate, + limit: limit, + verify: verify + }) + } +} + +/** + * Get the charset of a request. + * + * @param {object} req + * @api private + */ + +function getCharset (req) { + try { + return (contentType.parse(req).parameters.charset || '').toLowerCase() + } catch (e) { + return undefined + } +} + +/** + * Get the simple type checker. + * + * @param {string} type + * @return {function} + */ + +function typeChecker (type) { + return function checkType (req) { + return Boolean(typeis(req, type)) + } +} diff --git a/nodejs/node_modules/body-parser/lib/types/urlencoded.js b/nodejs/node_modules/body-parser/lib/types/urlencoded.js new file mode 100644 index 000000000..5ccda2182 --- /dev/null +++ b/nodejs/node_modules/body-parser/lib/types/urlencoded.js @@ -0,0 +1,284 @@ +/*! + * body-parser + * Copyright(c) 2014 Jonathan Ong + * Copyright(c) 2014-2015 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict' + +/** + * Module dependencies. + * @private + */ + +var bytes = require('bytes') +var contentType = require('content-type') +var createError = require('http-errors') +var debug = require('debug')('body-parser:urlencoded') +var deprecate = require('depd')('body-parser') +var read = require('../read') +var typeis = require('type-is') + +/** + * Module exports. + */ + +module.exports = urlencoded + +/** + * Cache of parser modules. + */ + +var parsers = Object.create(null) + +/** + * Create a middleware to parse urlencoded bodies. + * + * @param {object} [options] + * @return {function} + * @public + */ + +function urlencoded (options) { + var opts = options || {} + + // notice because option default will flip in next major + if (opts.extended === undefined) { + deprecate('undefined extended: provide extended option') + } + + var extended = opts.extended !== false + var inflate = opts.inflate !== false + var limit = typeof opts.limit !== 'number' + ? bytes.parse(opts.limit || '100kb') + : opts.limit + var type = opts.type || 'application/x-www-form-urlencoded' + var verify = opts.verify || false + + if (verify !== false && typeof verify !== 'function') { + throw new TypeError('option verify must be function') + } + + // create the appropriate query parser + var queryparse = extended + ? extendedparser(opts) + : simpleparser(opts) + + // create the appropriate type checking function + var shouldParse = typeof type !== 'function' + ? typeChecker(type) + : type + + function parse (body) { + return body.length + ? queryparse(body) + : {} + } + + return function urlencodedParser (req, res, next) { + if (req._body) { + debug('body already parsed') + next() + return + } + + req.body = req.body || {} + + // skip requests without bodies + if (!typeis.hasBody(req)) { + debug('skip empty body') + next() + return + } + + debug('content-type %j', req.headers['content-type']) + + // determine if request should be parsed + if (!shouldParse(req)) { + debug('skip parsing') + next() + return + } + + // assert charset + var charset = getCharset(req) || 'utf-8' + if (charset !== 'utf-8') { + debug('invalid charset') + next(createError(415, 'unsupported charset "' + charset.toUpperCase() + '"', { + charset: charset, + type: 'charset.unsupported' + })) + return + } + + // read + read(req, res, next, parse, debug, { + debug: debug, + encoding: charset, + inflate: inflate, + limit: limit, + verify: verify + }) + } +} + +/** + * Get the extended query parser. + * + * @param {object} options + */ + +function extendedparser (options) { + var parameterLimit = options.parameterLimit !== undefined + ? options.parameterLimit + : 1000 + var parse = parser('qs') + + if (isNaN(parameterLimit) || parameterLimit < 1) { + throw new TypeError('option parameterLimit must be a positive number') + } + + if (isFinite(parameterLimit)) { + parameterLimit = parameterLimit | 0 + } + + return function queryparse (body) { + var paramCount = parameterCount(body, parameterLimit) + + if (paramCount === undefined) { + debug('too many parameters') + throw createError(413, 'too many parameters', { + type: 'parameters.too.many' + }) + } + + var arrayLimit = Math.max(100, paramCount) + + debug('parse extended urlencoding') + return parse(body, { + allowPrototypes: true, + arrayLimit: arrayLimit, + depth: Infinity, + parameterLimit: parameterLimit + }) + } +} + +/** + * Get the charset of a request. + * + * @param {object} req + * @api private + */ + +function getCharset (req) { + try { + return (contentType.parse(req).parameters.charset || '').toLowerCase() + } catch (e) { + return undefined + } +} + +/** + * Count the number of parameters, stopping once limit reached + * + * @param {string} body + * @param {number} limit + * @api private + */ + +function parameterCount (body, limit) { + var count = 0 + var index = 0 + + while ((index = body.indexOf('&', index)) !== -1) { + count++ + index++ + + if (count === limit) { + return undefined + } + } + + return count +} + +/** + * Get parser for module name dynamically. + * + * @param {string} name + * @return {function} + * @api private + */ + +function parser (name) { + var mod = parsers[name] + + if (mod !== undefined) { + return mod.parse + } + + // this uses a switch for static require analysis + switch (name) { + case 'qs': + mod = require('qs') + break + case 'querystring': + mod = require('querystring') + break + } + + // store to prevent invoking require() + parsers[name] = mod + + return mod.parse +} + +/** + * Get the simple query parser. + * + * @param {object} options + */ + +function simpleparser (options) { + var parameterLimit = options.parameterLimit !== undefined + ? options.parameterLimit + : 1000 + var parse = parser('querystring') + + if (isNaN(parameterLimit) || parameterLimit < 1) { + throw new TypeError('option parameterLimit must be a positive number') + } + + if (isFinite(parameterLimit)) { + parameterLimit = parameterLimit | 0 + } + + return function queryparse (body) { + var paramCount = parameterCount(body, parameterLimit) + + if (paramCount === undefined) { + debug('too many parameters') + throw createError(413, 'too many parameters', { + type: 'parameters.too.many' + }) + } + + debug('parse urlencoding') + return parse(body, undefined, undefined, {maxKeys: parameterLimit}) + } +} + +/** + * Get the simple type checker. + * + * @param {string} type + * @return {function} + */ + +function typeChecker (type) { + return function checkType (req) { + return Boolean(typeis(req, type)) + } +} diff --git a/nodejs/node_modules/body-parser/package.json b/nodejs/node_modules/body-parser/package.json new file mode 100644 index 000000000..405f56094 --- /dev/null +++ b/nodejs/node_modules/body-parser/package.json @@ -0,0 +1,94 @@ +{ + "_args": [ + [ + "body-parser@1.18.2", + "/Users/muammar/github/mkchromecast/nodejs" + ] + ], + "_from": "body-parser@1.18.2", + "_id": "body-parser@1.18.2", + "_inBundle": false, + "_integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "_location": "/body-parser", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "body-parser@1.18.2", + "name": "body-parser", + "escapedName": "body-parser", + "rawSpec": "1.18.2", + "saveSpec": null, + "fetchSpec": "1.18.2" + }, + "_requiredBy": [ + "/express" + ], + "_resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", + "_spec": "1.18.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", + "bugs": { + "url": "https://github.com/expressjs/body-parser/issues" + }, + "contributors": [ + { + "name": "Douglas Christopher Wilson", + "email": "doug@somethingdoug.com" + }, + { + "name": "Jonathan Ong", + "email": "me@jongleberry.com", + "url": "http://jongleberry.com" + } + ], + "dependencies": { + "bytes": "3.0.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.1", + "http-errors": "~1.6.2", + "iconv-lite": "0.4.19", + "on-finished": "~2.3.0", + "qs": "6.5.1", + "raw-body": "2.3.2", + "type-is": "~1.6.15" + }, + "description": "Node.js body parsing middleware", + "devDependencies": { + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", + "istanbul": "0.4.5", + "methods": "1.1.2", + "mocha": "2.5.3", + "safe-buffer": "5.1.1", + "supertest": "1.1.0" + }, + "engines": { + "node": ">= 0.8" + }, + "files": [ + "lib/", + "LICENSE", + "HISTORY.md", + "index.js" + ], + "homepage": "https://github.com/expressjs/body-parser#readme", + "license": "MIT", + "name": "body-parser", + "repository": { + "type": "git", + "url": "git+https://github.com/expressjs/body-parser.git" + }, + "scripts": { + "lint": "eslint --plugin markdown --ext js,md .", + "test": "mocha --require test/support/env --reporter spec --check-leaks --bail test/", + "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --require test/support/env --reporter dot --check-leaks test/", + "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --require test/support/env --reporter spec --check-leaks test/" + }, + "version": "1.18.2" +} diff --git a/nodejs/node_modules/bytes/History.md b/nodejs/node_modules/bytes/History.md new file mode 100644 index 000000000..13d463ab1 --- /dev/null +++ b/nodejs/node_modules/bytes/History.md @@ -0,0 +1,82 @@ +3.0.0 / 2017-08-31 +================== + + * Change "kB" to "KB" in format output + * Remove support for Node.js 0.6 + * Remove support for ComponentJS + +2.5.0 / 2017-03-24 +================== + + * Add option "unit" + +2.4.0 / 2016-06-01 +================== + + * Add option "unitSeparator" + +2.3.0 / 2016-02-15 +================== + + * Drop partial bytes on all parsed units + * Fix non-finite numbers to `.format` to return `null` + * Fix parsing byte string that looks like hex + * perf: hoist regular expressions + +2.2.0 / 2015-11-13 +================== + + * add option "decimalPlaces" + * add option "fixedDecimals" + +2.1.0 / 2015-05-21 +================== + + * add `.format` export + * add `.parse` export + +2.0.2 / 2015-05-20 +================== + + * remove map recreation + * remove unnecessary object construction + +2.0.1 / 2015-05-07 +================== + + * fix browserify require + * remove node.extend dependency + +2.0.0 / 2015-04-12 +================== + + * add option "case" + * add option "thousandsSeparator" + * return "null" on invalid parse input + * support proper round-trip: bytes(bytes(num)) === num + * units no longer case sensitive when parsing + +1.0.0 / 2014-05-05 +================== + + * add negative support. fixes #6 + +0.3.0 / 2014-03-19 +================== + + * added terabyte support + +0.2.1 / 2013-04-01 +================== + + * add .component + +0.2.0 / 2012-10-28 +================== + + * bytes(200).should.eql('200b') + +0.1.0 / 2012-07-04 +================== + + * add bytes to string conversion [yields] diff --git a/nodejs/node_modules/bytes/LICENSE b/nodejs/node_modules/bytes/LICENSE new file mode 100644 index 000000000..63e95a963 --- /dev/null +++ b/nodejs/node_modules/bytes/LICENSE @@ -0,0 +1,23 @@ +(The MIT License) + +Copyright (c) 2012-2014 TJ Holowaychuk +Copyright (c) 2015 Jed Watson + +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/nodejs/node_modules/bytes/Readme.md b/nodejs/node_modules/bytes/Readme.md new file mode 100644 index 000000000..9b53745d1 --- /dev/null +++ b/nodejs/node_modules/bytes/Readme.md @@ -0,0 +1,125 @@ +# Bytes utility + +[![NPM Version][npm-image]][npm-url] +[![NPM Downloads][downloads-image]][downloads-url] +[![Build Status][travis-image]][travis-url] +[![Test Coverage][coveralls-image]][coveralls-url] + +Utility to parse a string bytes (ex: `1TB`) to bytes (`1099511627776`) and vice-versa. + +## Installation + +This is a [Node.js](https://nodejs.org/en/) module available through the +[npm registry](https://www.npmjs.com/). Installation is done using the +[`npm install` command](https://docs.npmjs.com/getting-started/installing-npm-packages-locally): + +```bash +$ npm install bytes +``` + +## Usage + +```js +var bytes = require('bytes'); +``` + +#### bytes.format(number value, [options]): string｜null + +Format the given value in bytes into a string. If the value is negative, it is kept as such. If it is a float, it is + rounded. + +**Arguments** + +| Name | Type | Description | +|---------|----------|--------------------| +| value | `number` | Value in bytes | +| options | `Object` | Conversion options | + +**Options** + +| Property | Type | Description | +|-------------------|--------|-----------------------------------------------------------------------------------------| +| decimalPlaces | `number`｜`null` | Maximum number of decimal places to include in output. Default value to `2`. | +| fixedDecimals | `boolean`｜`null` | Whether to always display the maximum number of decimal places. Default value to `false` | +| thousandsSeparator | `string`｜`null` | Example of values: `' '`, `','` and `.`... Default value to `''`. | +| unit | `string`｜`null` | The unit in which the result will be returned (B/KB/MB/GB/TB). Default value to `''` (which means auto detect). | +| unitSeparator | `string`｜`null` | Separator to use between number and unit. Default value to `''`. | + +**Returns** + +| Name | Type | Description | +|---------|------------------|-------------------------------------------------| +| results | `string`｜`null` | Return null upon error. String value otherwise. | + +**Example** + +```js +bytes(1024); +// output: '1KB' + +bytes(1000); +// output: '1000B' + +bytes(1000, {thousandsSeparator: ' '}); +// output: '1 000B' + +bytes(1024 * 1.7, {decimalPlaces: 0}); +// output: '2KB' + +bytes(1024, {unitSeparator: ' '}); +// output: '1 KB' + +``` + +#### bytes.parse(string｜number value): number｜null + +Parse the string value into an integer in bytes. If no unit is given, or `value` +is a number, it is assumed the value is in bytes. + +Supported units and abbreviations are as follows and are case-insensitive: + + * `b` for bytes + * `kb` for kilobytes + * `mb` for megabytes + * `gb` for gigabytes + * `tb` for terabytes + +The units are in powers of two, not ten. This means 1kb = 1024b according to this parser. + +**Arguments** + +| Name | Type | Description | +|---------------|--------|--------------------| +| value | `string`｜`number` | String to parse, or number in bytes. | + +**Returns** + +| Name | Type | Description | +|---------|-------------|-------------------------| +| results | `number`｜`null` | Return null upon error. Value in bytes otherwise. | + +**Example** + +```js +bytes('1KB'); +// output: 1024 + +bytes('1024'); +// output: 1024 + +bytes(1024); +// output: 1024 +``` + +## License + +[MIT](LICENSE) + +[downloads-image]: https://img.shields.io/npm/dm/bytes.svg +[downloads-url]: https://npmjs.org/package/bytes +[npm-image]: https://img.shields.io/npm/v/bytes.svg +[npm-url]: https://npmjs.org/package/bytes +[travis-image]: https://img.shields.io/travis/visionmedia/bytes.js/master.svg +[travis-url]: https://travis-ci.org/visionmedia/bytes.js +[coveralls-image]: https://img.shields.io/coveralls/visionmedia/bytes.js/master.svg +[coveralls-url]: https://coveralls.io/r/visionmedia/bytes.js?branch=master diff --git a/nodejs/node_modules/bytes/index.js b/nodejs/node_modules/bytes/index.js new file mode 100644 index 000000000..1e39afd1d --- /dev/null +++ b/nodejs/node_modules/bytes/index.js @@ -0,0 +1,159 @@ +/*! + * bytes + * Copyright(c) 2012-2014 TJ Holowaychuk + * Copyright(c) 2015 Jed Watson + * MIT Licensed + */ + +'use strict'; + +/** + * Module exports. + * @public + */ + +module.exports = bytes; +module.exports.format = format; +module.exports.parse = parse; + +/** + * Module variables. + * @private + */ + +var formatThousandsRegExp = /\B(?=(\d{3})+(?!\d))/g; + +var formatDecimalsRegExp = /(?:\.0*|(\.[^0]+)0+)$/; + +var map = { + b: 1, + kb: 1 << 10, + mb: 1 << 20, + gb: 1 << 30, + tb: ((1 << 30) * 1024) +}; + +var parseRegExp = /^((-|\+)?(\d+(?:\.\d+)?)) *(kb|mb|gb|tb)$/i; + +/** + * Convert the given value in bytes into a string or parse to string to an integer in bytes. + * + * @param {string|number} value + * @param {{ + * case: [string], + * decimalPlaces: [number] + * fixedDecimals: [boolean] + * thousandsSeparator: [string] + * unitSeparator: [string] + * }} [options] bytes options. + * + * @returns {string|number|null} + */ + +function bytes(value, options) { + if (typeof value === 'string') { + return parse(value); + } + + if (typeof value === 'number') { + return format(value, options); + } + + return null; +} + +/** + * Format the given value in bytes into a string. + * + * If the value is negative, it is kept as such. If it is a float, + * it is rounded. + * + * @param {number} value + * @param {object} [options] + * @param {number} [options.decimalPlaces=2] + * @param {number} [options.fixedDecimals=false] + * @param {string} [options.thousandsSeparator=] + * @param {string} [options.unit=] + * @param {string} [options.unitSeparator=] + * + * @returns {string|null} + * @public + */ + +function format(value, options) { + if (!Number.isFinite(value)) { + return null; + } + + var mag = Math.abs(value); + var thousandsSeparator = (options && options.thousandsSeparator) || ''; + var unitSeparator = (options && options.unitSeparator) || ''; + var decimalPlaces = (options && options.decimalPlaces !== undefined) ? options.decimalPlaces : 2; + var fixedDecimals = Boolean(options && options.fixedDecimals); + var unit = (options && options.unit) || ''; + + if (!unit || !map[unit.toLowerCase()]) { + if (mag >= map.tb) { + unit = 'TB'; + } else if (mag >= map.gb) { + unit = 'GB'; + } else if (mag >= map.mb) { + unit = 'MB'; + } else if (mag >= map.kb) { + unit = 'KB'; + } else { + unit = 'B'; + } + } + + var val = value / map[unit.toLowerCase()]; + var str = val.toFixed(decimalPlaces); + + if (!fixedDecimals) { + str = str.replace(formatDecimalsRegExp, '$1'); + } + + if (thousandsSeparator) { + str = str.replace(formatThousandsRegExp, thousandsSeparator); + } + + return str + unitSeparator + unit; +} + +/** + * Parse the string value into an integer in bytes. + * + * If no unit is given, it is assumed the value is in bytes. + * + * @param {number|string} val + * + * @returns {number|null} + * @public + */ + +function parse(val) { + if (typeof val === 'number' && !isNaN(val)) { + return val; + } + + if (typeof val !== 'string') { + return null; + } + + // Test if the string passed is valid + var results = parseRegExp.exec(val); + var floatValue; + var unit = 'b'; + + if (!results) { + // Nothing could be extracted from the given string + floatValue = parseInt(val, 10); + unit = 'b' + } else { + // Retrieve the value and the unit + floatValue = parseFloat(results[1]); + unit = results[4].toLowerCase(); + } + + return Math.floor(map[unit] * floatValue); +} diff --git a/nodejs/node_modules/bytes/package.json b/nodejs/node_modules/bytes/package.json new file mode 100644 index 000000000..982bbbf32 --- /dev/null +++ b/nodejs/node_modules/bytes/package.json @@ -0,0 +1,85 @@ +{ + "_args": [ + [ + "bytes@3.0.0", + "/Users/muammar/github/mkchromecast/nodejs" + ] + ], + "_from": "bytes@3.0.0", + "_id": "bytes@3.0.0", + "_inBundle": false, + "_integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "_location": "/bytes", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "bytes@3.0.0", + "name": "bytes", + "escapedName": "bytes", + "rawSpec": "3.0.0", + "saveSpec": null, + "fetchSpec": "3.0.0" + }, + "_requiredBy": [ + "/body-parser", + "/raw-body" + ], + "_resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "_spec": "3.0.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", + "author": { + "name": "TJ Holowaychuk", + "email": "tj@vision-media.ca", + "url": "http://tjholowaychuk.com" + }, + "bugs": { + "url": "https://github.com/visionmedia/bytes.js/issues" + }, + "contributors": [ + { + "name": "Jed Watson", + "email": "jed.watson@me.com" + }, + { + "name": "Théo FIDRY", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Utility to parse a string bytes to bytes and vice-versa", + "devDependencies": { + "mocha": "2.5.3", + "nyc": "10.3.2" + }, + "engines": { + "node": ">= 0.8" + }, + "files": [ + "History.md", + "LICENSE", + "Readme.md", + "index.js" + ], + "homepage": "https://github.com/visionmedia/bytes.js#readme", + "keywords": [ + "byte", + "bytes", + "utility", + "parse", + "parser", + "convert", + "converter" + ], + "license": "MIT", + "name": "bytes", + "repository": { + "type": "git", + "url": "git+https://github.com/visionmedia/bytes.js.git" + }, + "scripts": { + "test": "mocha --check-leaks --reporter spec", + "test-ci": "nyc --reporter=text npm test", + "test-cov": "nyc --reporter=html --reporter=text npm test" + }, + "version": "3.0.0" +} diff --git a/nodejs/node_modules/chalk/package.json b/nodejs/node_modules/chalk/package.json index a58b7cec4..9aa959e79 100644 --- a/nodejs/node_modules/chalk/package.json +++ b/nodejs/node_modules/chalk/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "chalk@^0.5.1", - "scope": null, - "escapedName": "chalk", - "name": "chalk", - "rawSpec": "^0.5.1", - "spec": ">=0.5.1 <0.6.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio" + "chalk@0.5.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "chalk@>=0.5.1 <0.6.0", + "_from": "chalk@0.5.1", "_id": "chalk@0.5.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", "_location": "/chalk", - "_npmUser": { - "name": "jbnicolai", - "email": "jappelman@xebia.com" - }, - "_npmVersion": "1.4.14", "_phantomChildren": {}, "_requested": { - "raw": "chalk@^0.5.1", - "scope": null, - "escapedName": "chalk", + "type": "version", + "registry": true, + "raw": "chalk@0.5.1", "name": "chalk", - "rawSpec": "^0.5.1", - "spec": ">=0.5.1 <0.6.0", - "type": "range" + "escapedName": "chalk", + "rawSpec": "0.5.1", + "saveSpec": null, + "fetchSpec": "0.5.1" }, "_requiredBy": [ "/webcast-osx-audio" ], "_resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "_shasum": "663b3a648b68b55d04690d49167aa837858f2174", - "_shrinkwrap": null, - "_spec": "chalk@^0.5.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio", + "_spec": "0.5.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/sindresorhus/chalk/issues" }, @@ -55,19 +42,13 @@ "matcha": "^0.5.0", "mocha": "*" }, - "directories": {}, - "dist": { - "shasum": "663b3a648b68b55d04690d49167aa837858f2174", - "tarball": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz" - }, "engines": { "node": ">=0.10.0" }, "files": [ "index.js" ], - "gitHead": "994758f01293f1fdcf63282e9917cb9f2cfbdaac", - "homepage": "https://github.com/sindresorhus/chalk", + "homepage": "https://github.com/sindresorhus/chalk#readme", "keywords": [ "color", "colour", @@ -92,20 +73,19 @@ "license": "MIT", "maintainers": [ { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "http://sindresorhus.com" }, { - "name": "jbnicolai", - "email": "jappelman@xebia.com" + "name": "Joshua Appelman", + "email": "joshua@jbna.nl" } ], "name": "chalk", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", - "url": "git://github.com/sindresorhus/chalk.git" + "url": "git+https://github.com/sindresorhus/chalk.git" }, "scripts": { "bench": "matcha benchmark.js", diff --git a/nodejs/node_modules/content-disposition/package.json b/nodejs/node_modules/content-disposition/package.json index 207c068fa..fca050963 100644 --- a/nodejs/node_modules/content-disposition/package.json +++ b/nodejs/node_modules/content-disposition/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "content-disposition@0.5.2", - "scope": null, - "escapedName": "content-disposition", - "name": "content-disposition", - "rawSpec": "0.5.2", - "spec": "0.5.2", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "content-disposition@0.5.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "content-disposition@0.5.2", "_id": "content-disposition@0.5.2", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", "_location": "/content-disposition", - "_nodeVersion": "4.6.0", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/content-disposition-0.5.2.tgz_1481246224565_0.35659545403905213" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.9", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "content-disposition@0.5.2", - "scope": null, - "escapedName": "content-disposition", "name": "content-disposition", + "escapedName": "content-disposition", "rawSpec": "0.5.2", - "spec": "0.5.2", - "type": "version" + "saveSpec": null, + "fetchSpec": "0.5.2" }, "_requiredBy": [ "/express" ], "_resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "_shasum": "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4", - "_shrinkwrap": null, - "_spec": "content-disposition@0.5.2", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "0.5.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/content-disposition/issues" }, @@ -54,7 +36,6 @@ "email": "doug@somethingdoug.com" } ], - "dependencies": {}, "description": "Create and parse Content-Disposition header", "devDependencies": { "eslint": "3.11.1", @@ -64,11 +45,6 @@ "istanbul": "0.4.5", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4", - "tarball": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -78,7 +54,6 @@ "README.md", "index.js" ], - "gitHead": "2a08417377cf55678c9f870b305f3c6c088920f3", "homepage": "https://github.com/jshttp/content-disposition#readme", "keywords": [ "content-disposition", @@ -87,15 +62,7 @@ "res" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "content-disposition", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/content-disposition.git" diff --git a/nodejs/node_modules/content-type/HISTORY.md b/nodejs/node_modules/content-type/HISTORY.md index 01652ff46..8f5cb7030 100644 --- a/nodejs/node_modules/content-type/HISTORY.md +++ b/nodejs/node_modules/content-type/HISTORY.md @@ -1,3 +1,13 @@ +1.0.4 / 2017-09-11 +================== + + * perf: skip parameter parsing when no parameters + +1.0.3 / 2017-09-10 +================== + + * perf: remove argument reassignment + 1.0.2 / 2016-05-09 ================== diff --git a/nodejs/node_modules/content-type/index.js b/nodejs/node_modules/content-type/index.js index 61ba6b5a2..6ce03f208 100644 --- a/nodejs/node_modules/content-type/index.js +++ b/nodejs/node_modules/content-type/index.js @@ -20,9 +20,9 @@ * obs-text = %x80-FF * quoted-pair = "\" ( HTAB / SP / VCHAR / obs-text ) */ -var paramRegExp = /; *([!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+) *= *("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+) */g -var textRegExp = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/ -var tokenRegExp = /^[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+$/ +var PARAM_REGEXP = /; *([!#$%&'*+.^_`|~0-9A-Za-z-]+) *= *("(?:[\u000b\u0020\u0021\u0023-\u005b\u005d-\u007e\u0080-\u00ff]|\\[\u000b\u0020-\u00ff])*"|[!#$%&'*+.^_`|~0-9A-Za-z-]+) */g +var TEXT_REGEXP = /^[\u000b\u0020-\u007e\u0080-\u00ff]+$/ +var TOKEN_REGEXP = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/ /** * RegExp to match quoted-pair in RFC 7230 sec 3.2.6 @@ -30,21 +30,21 @@ var tokenRegExp = /^[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+$/ * quoted-pair = "\" ( HTAB / SP / VCHAR / obs-text ) * obs-text = %x80-FF */ -var qescRegExp = /\\([\u000b\u0020-\u00ff])/g +var QESC_REGEXP = /\\([\u000b\u0020-\u00ff])/g /** * RegExp to match chars that must be quoted-pair in RFC 7230 sec 3.2.6 */ -var quoteRegExp = /([\\"])/g +var QUOTE_REGEXP = /([\\"])/g /** - * RegExp to match type in RFC 6838 + * RegExp to match type in RFC 7231 sec 3.1.1.1 * * media-type = type "/" subtype * type = token * subtype = token */ -var typeRegExp = /^[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+\/[!#$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+$/ +var TYPE_REGEXP = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+\/[!#$%&'*+.^_`|~0-9A-Za-z-]+$/ /** * Module exports. @@ -62,7 +62,7 @@ exports.parse = parse * @public */ -function format(obj) { +function format (obj) { if (!obj || typeof obj !== 'object') { throw new TypeError('argument obj is required') } @@ -70,7 +70,7 @@ function format(obj) { var parameters = obj.parameters var type = obj.type - if (!type || !typeRegExp.test(type)) { + if (!type || !TYPE_REGEXP.test(type)) { throw new TypeError('invalid type') } @@ -84,7 +84,7 @@ function format(obj) { for (var i = 0; i < params.length; i++) { param = params[i] - if (!tokenRegExp.test(param)) { + if (!TOKEN_REGEXP.test(param)) { throw new TypeError('invalid parameter name') } @@ -103,61 +103,61 @@ function format(obj) { * @public */ -function parse(string) { +function parse (string) { if (!string) { throw new TypeError('argument string is required') } - if (typeof string === 'object') { - // support req/res-like objects as argument - string = getcontenttype(string) + // support req/res-like objects as argument + var header = typeof string === 'object' + ? getcontenttype(string) + : string - if (typeof string !== 'string') { - throw new TypeError('content-type header is missing from object'); - } - } - - if (typeof string !== 'string') { + if (typeof header !== 'string') { throw new TypeError('argument string is required to be a string') } - var index = string.indexOf(';') + var index = header.indexOf(';') var type = index !== -1 - ? string.substr(0, index).trim() - : string.trim() + ? header.substr(0, index).trim() + : header.trim() - if (!typeRegExp.test(type)) { + if (!TYPE_REGEXP.test(type)) { throw new TypeError('invalid media type') } - var key - var match var obj = new ContentType(type.toLowerCase()) - var value - paramRegExp.lastIndex = index + // parse parameters + if (index !== -1) { + var key + var match + var value - while (match = paramRegExp.exec(string)) { - if (match.index !== index) { - throw new TypeError('invalid parameter format') - } + PARAM_REGEXP.lastIndex = index - index += match[0].length - key = match[1].toLowerCase() - value = match[2] + while ((match = PARAM_REGEXP.exec(header))) { + if (match.index !== index) { + throw new TypeError('invalid parameter format') + } - if (value[0] === '"') { - // remove quotes and escapes - value = value - .substr(1, value.length - 2) - .replace(qescRegExp, '$1') - } + index += match[0].length + key = match[1].toLowerCase() + value = match[2] - obj.parameters[key] = value - } + if (value[0] === '"') { + // remove quotes and escapes + value = value + .substr(1, value.length - 2) + .replace(QESC_REGEXP, '$1') + } - if (index !== -1 && index !== string.length) { - throw new TypeError('invalid parameter format') + obj.parameters[key] = value + } + + if (index !== header.length) { + throw new TypeError('invalid parameter format') + } } return obj @@ -171,16 +171,22 @@ function parse(string) { * @private */ -function getcontenttype(obj) { +function getcontenttype (obj) { + var header + if (typeof obj.getHeader === 'function') { // res-like - return obj.getHeader('content-type') + header = obj.getHeader('content-type') + } else if (typeof obj.headers === 'object') { + // req-like + header = obj.headers && obj.headers['content-type'] } - if (typeof obj.headers === 'object') { - // req-like - return obj.headers && obj.headers['content-type'] + if (typeof header !== 'string') { + throw new TypeError('content-type header is missing from object') } + + return header } /** @@ -191,26 +197,26 @@ function getcontenttype(obj) { * @private */ -function qstring(val) { +function qstring (val) { var str = String(val) // no need to quote tokens - if (tokenRegExp.test(str)) { + if (TOKEN_REGEXP.test(str)) { return str } - if (str.length > 0 && !textRegExp.test(str)) { + if (str.length > 0 && !TEXT_REGEXP.test(str)) { throw new TypeError('invalid parameter value') } - return '"' + str.replace(quoteRegExp, '\\$1') + '"' + return '"' + str.replace(QUOTE_REGEXP, '\\$1') + '"' } /** * Class to represent a content type. * @private */ -function ContentType(type) { +function ContentType (type) { this.parameters = Object.create(null) this.type = type } diff --git a/nodejs/node_modules/content-type/package.json b/nodejs/node_modules/content-type/package.json index a61596e4d..a9a4d5dc2 100644 --- a/nodejs/node_modules/content-type/package.json +++ b/nodejs/node_modules/content-type/package.json @@ -1,50 +1,33 @@ { "_args": [ [ - { - "raw": "content-type@~1.0.2", - "scope": null, - "escapedName": "content-type", - "name": "content-type", - "rawSpec": "~1.0.2", - "spec": ">=1.0.2 <1.1.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "content-type@1.0.4", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "content-type@>=1.0.2 <1.1.0", - "_id": "content-type@1.0.2", - "_inCache": true, + "_from": "content-type@1.0.4", + "_id": "content-type@1.0.4", + "_inBundle": false, + "_integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", "_location": "/content-type", - "_nodeVersion": "4.4.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/content-type-1.0.2.tgz_1462852785748_0.5491233412176371" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.1", "_phantomChildren": {}, "_requested": { - "raw": "content-type@~1.0.2", - "scope": null, - "escapedName": "content-type", + "type": "version", + "registry": true, + "raw": "content-type@1.0.4", "name": "content-type", - "rawSpec": "~1.0.2", - "spec": ">=1.0.2 <1.1.0", - "type": "range" + "escapedName": "content-type", + "rawSpec": "1.0.4", + "saveSpec": null, + "fetchSpec": "1.0.4" }, "_requiredBy": [ + "/body-parser", "/express" ], - "_resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", - "_shasum": "b7d113aee7a8dd27bd21133c4dc2529df1721eed", - "_shrinkwrap": null, - "_spec": "content-type@~1.0.2", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "_spec": "1.0.4", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" @@ -52,17 +35,17 @@ "bugs": { "url": "https://github.com/jshttp/content-type/issues" }, - "dependencies": {}, "description": "Create and parse HTTP Content-Type header", "devDependencies": { - "istanbul": "0.4.3", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", + "istanbul": "0.4.5", "mocha": "~1.21.5" }, - "directories": {}, - "dist": { - "shasum": "b7d113aee7a8dd27bd21133c4dc2529df1721eed", - "tarball": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -72,7 +55,6 @@ "README.md", "index.js" ], - "gitHead": "8118763adfbbac80cf1254191889330aec8b8be7", "homepage": "https://github.com/jshttp/content-type#readme", "keywords": [ "content-type", @@ -82,23 +64,16 @@ "rfc7231" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "content-type", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/content-type.git" }, "scripts": { + "lint": "eslint .", "test": "mocha --reporter spec --check-leaks --bail test/", "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/" }, - "version": "1.0.2" + "version": "1.0.4" } diff --git a/nodejs/node_modules/cookie-signature/package.json b/nodejs/node_modules/cookie-signature/package.json index cf83590f4..a76876e79 100644 --- a/nodejs/node_modules/cookie-signature/package.json +++ b/nodejs/node_modules/cookie-signature/package.json @@ -1,46 +1,32 @@ { "_args": [ [ - { - "raw": "cookie-signature@1.0.6", - "scope": null, - "escapedName": "cookie-signature", - "name": "cookie-signature", - "rawSpec": "1.0.6", - "spec": "1.0.6", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "cookie-signature@1.0.6", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "cookie-signature@1.0.6", "_id": "cookie-signature@1.0.6", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "_location": "/cookie-signature", - "_nodeVersion": "0.10.36", - "_npmUser": { - "name": "natevw", - "email": "natevw@yahoo.com" - }, - "_npmVersion": "2.3.0", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "cookie-signature@1.0.6", - "scope": null, - "escapedName": "cookie-signature", "name": "cookie-signature", + "escapedName": "cookie-signature", "rawSpec": "1.0.6", - "spec": "1.0.6", - "type": "version" + "saveSpec": null, + "fetchSpec": "1.0.6" }, "_requiredBy": [ "/express" ], "_resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "_shasum": "e303a882b342cc3ee8ca513a79999734dab3ae2c", - "_shrinkwrap": null, - "_spec": "cookie-signature@1.0.6", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.0.6", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "TJ Holowaychuk", "email": "tj@learnboost.com" @@ -54,13 +40,7 @@ "mocha": "*", "should": "*" }, - "directories": {}, - "dist": { - "shasum": "e303a882b342cc3ee8ca513a79999734dab3ae2c", - "tarball": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" - }, - "gitHead": "391b56cf44d88c493491b7e3fc53208cfb976d2a", - "homepage": "https://github.com/visionmedia/node-cookie-signature", + "homepage": "https://github.com/visionmedia/node-cookie-signature#readme", "keywords": [ "cookie", "sign", @@ -68,19 +48,7 @@ ], "license": "MIT", "main": "index", - "maintainers": [ - { - "name": "tjholowaychuk", - "email": "tj@vision-media.ca" - }, - { - "name": "natevw", - "email": "natevw@yahoo.com" - } - ], "name": "cookie-signature", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/visionmedia/node-cookie-signature.git" diff --git a/nodejs/node_modules/cookie/package.json b/nodejs/node_modules/cookie/package.json index 7790922fa..a9b794c72 100644 --- a/nodejs/node_modules/cookie/package.json +++ b/nodejs/node_modules/cookie/package.json @@ -1,49 +1,32 @@ { "_args": [ [ - { - "raw": "cookie@0.3.1", - "scope": null, - "escapedName": "cookie", - "name": "cookie", - "rawSpec": "0.3.1", - "spec": "0.3.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "cookie@0.3.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "cookie@0.3.1", "_id": "cookie@0.3.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", "_location": "/cookie", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/cookie-0.3.1.tgz_1464323556714_0.6435900838114321" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "cookie@0.3.1", - "scope": null, - "escapedName": "cookie", "name": "cookie", + "escapedName": "cookie", "rawSpec": "0.3.1", - "spec": "0.3.1", - "type": "version" + "saveSpec": null, + "fetchSpec": "0.3.1" }, "_requiredBy": [ "/express" ], "_resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "_shasum": "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb", - "_shrinkwrap": null, - "_spec": "cookie@0.3.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "0.3.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Roman Shtylman", "email": "shtylman@gmail.com" @@ -57,17 +40,11 @@ "email": "doug@somethingdoug.com" } ], - "dependencies": {}, "description": "HTTP server cookie parsing and serialization", "devDependencies": { "istanbul": "0.4.3", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb", - "tarball": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -77,22 +54,13 @@ "README.md", "index.js" ], - "gitHead": "e3c77d497d66c8b8d4b677b8954c1b192a09f0b3", - "homepage": "https://github.com/jshttp/cookie", + "homepage": "https://github.com/jshttp/cookie#readme", "keywords": [ "cookie", "cookies" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "cookie", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/cookie.git" diff --git a/nodejs/node_modules/core-util-is/package.json b/nodejs/node_modules/core-util-is/package.json index 688e561f2..7cb0a6ecb 100644 --- a/nodejs/node_modules/core-util-is/package.json +++ b/nodejs/node_modules/core-util-is/package.json @@ -1,46 +1,32 @@ { "_args": [ [ - { - "raw": "core-util-is@~1.0.0", - "scope": null, - "escapedName": "core-util-is", - "name": "core-util-is", - "rawSpec": "~1.0.0", - "spec": ">=1.0.0 <1.1.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/readable-stream" + "core-util-is@1.0.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "core-util-is@>=1.0.0 <1.1.0", + "_from": "core-util-is@1.0.2", "_id": "core-util-is@1.0.2", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "_location": "/core-util-is", - "_nodeVersion": "4.0.0", - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" - }, - "_npmVersion": "3.3.2", "_phantomChildren": {}, "_requested": { - "raw": "core-util-is@~1.0.0", - "scope": null, - "escapedName": "core-util-is", + "type": "version", + "registry": true, + "raw": "core-util-is@1.0.2", "name": "core-util-is", - "rawSpec": "~1.0.0", - "spec": ">=1.0.0 <1.1.0", - "type": "range" + "escapedName": "core-util-is", + "rawSpec": "1.0.2", + "saveSpec": null, + "fetchSpec": "1.0.2" }, "_requiredBy": [ "/readable-stream" ], "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "_shasum": "b5fd54220aa2bc5ab57aab7140c940754503c1a7", - "_shrinkwrap": null, - "_spec": "core-util-is@~1.0.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/readable-stream", + "_spec": "1.0.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -49,17 +35,10 @@ "bugs": { "url": "https://github.com/isaacs/core-util-is/issues" }, - "dependencies": {}, "description": "The `util.is*` functions introduced in Node v0.12.", "devDependencies": { "tap": "^2.3.0" }, - "directories": {}, - "dist": { - "shasum": "b5fd54220aa2bc5ab57aab7140c940754503c1a7", - "tarball": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "gitHead": "a177da234df5638b363ddc15fa324619a38577c8", "homepage": "https://github.com/isaacs/core-util-is#readme", "keywords": [ "util", @@ -74,15 +53,7 @@ ], "license": "MIT", "main": "lib/util.js", - "maintainers": [ - { - "name": "isaacs", - "email": "i@izs.me" - } - ], "name": "core-util-is", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/isaacs/core-util-is.git" diff --git a/nodejs/node_modules/debug/CHANGELOG.md b/nodejs/node_modules/debug/CHANGELOG.md index 93580f1cc..eadaa1895 100644 --- a/nodejs/node_modules/debug/CHANGELOG.md +++ b/nodejs/node_modules/debug/CHANGELOG.md @@ -1,8 +1,20 @@ -2.6.6 / 2017-04-27 +2.6.9 / 2017-09-22 ================== - * Fix: regression from removal of undefined check (@thebigredgeek) + * remove ReDoS regexp in %o formatter (#504) + +2.6.8 / 2017-05-18 +================== + + * Fix: Check for undefined on browser globals (#462, @marbemac) + +2.6.7 / 2017-05-16 +================== + + * Fix: Update ms to 2.0.0 to fix regular expression denial of service vulnerability (#458, @hubdotcom) + * Fix: Inline extend function in node implementation (#452, @dougwilson) + * Docs: Fix typo (#455, @msasad) 2.6.5 / 2017-04-27 ================== diff --git a/nodejs/node_modules/debug/Readme.md b/nodejs/node_modules/debug/Readme.md index 4aeab13f1..f67be6b31 100644 --- a/nodejs/node_modules/debug/Readme.md +++ b/nodejs/node_modules/debug/Readme.md @@ -100,7 +100,7 @@ Then, run the program to be debugged as usual. | Name | Purpose | |-----------|-------------------------------------------------| -| `DEBUG` | Enables/disabled specific debugging namespaces. | +| `DEBUG` | Enables/disables specific debugging namespaces. | | `DEBUG_COLORS`| Whether or not to use colors in the debug output. | | `DEBUG_DEPTH` | Object inspection depth. | | `DEBUG_SHOW_HIDDEN` | Shows hidden properties on inspected objects. | diff --git a/nodejs/node_modules/debug/component.json b/nodejs/node_modules/debug/component.json index 0705b91aa..9de26410f 100644 --- a/nodejs/node_modules/debug/component.json +++ b/nodejs/node_modules/debug/component.json @@ -2,7 +2,7 @@ "name": "debug", "repo": "visionmedia/debug", "description": "small debugging utility", - "version": "2.6.6", + "version": "2.6.9", "keywords": [ "debug", "log", diff --git a/nodejs/node_modules/debug/package.json b/nodejs/node_modules/debug/package.json index 84ffebf82..09b809a70 100644 --- a/nodejs/node_modules/debug/package.json +++ b/nodejs/node_modules/debug/package.json @@ -1,52 +1,38 @@ { "_args": [ [ - { - "raw": "debug@^2.0.0", - "scope": null, - "escapedName": "debug", - "name": "debug", - "rawSpec": "^2.0.0", - "spec": ">=2.0.0 <3.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio" + "debug@2.6.9", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "debug@>=2.0.0 <3.0.0", - "_id": "debug@2.6.6", - "_inCache": true, + "_from": "debug@2.6.9", + "_id": "debug@2.6.9", + "_inBundle": false, + "_integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "_location": "/debug", - "_nodeVersion": "6.9.2", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/debug-2.6.6.tgz_1493336101823_0.35170009173452854" - }, - "_npmUser": { - "name": "thebigredgeek", - "email": "rhyneandrew@gmail.com" - }, - "_npmVersion": "3.10.9", "_phantomChildren": {}, "_requested": { - "raw": "debug@^2.0.0", - "scope": null, - "escapedName": "debug", + "type": "version", + "registry": true, + "raw": "debug@2.6.9", "name": "debug", - "rawSpec": "^2.0.0", - "spec": ">=2.0.0 <3.0.0", - "type": "range" + "escapedName": "debug", + "rawSpec": "2.6.9", + "saveSpec": null, + "fetchSpec": "2.6.9" }, "_requiredBy": [ + "/body-parser", + "/express", + "/finalhandler", "/lame", "/osx-audio", + "/send", "/webcast-osx-audio" ], - "_resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz", - "_shasum": "a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a", - "_shrinkwrap": null, - "_spec": "debug@^2.0.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio", + "_resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "_spec": "2.6.9", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" @@ -73,7 +59,7 @@ } ], "dependencies": { - "ms": "0.7.3" + "ms": "2.0.0" }, "description": "small debugging utility", "devDependencies": { @@ -94,12 +80,6 @@ "sinon": "^1.17.6", "sinon-chai": "^2.8.0" }, - "directories": {}, - "dist": { - "shasum": "a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a", - "tarball": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz" - }, - "gitHead": "c90a2b3c6c17300f3c183f0d665092c16388c7ff", "homepage": "https://github.com/visionmedia/debug#readme", "keywords": [ "debug", @@ -108,19 +88,10 @@ ], "license": "MIT", "main": "./src/index.js", - "maintainers": [ - { - "name": "thebigredgeek", - "email": "rhyneandrew@gmail.com" - } - ], "name": "debug", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/visionmedia/debug.git" }, - "scripts": {}, - "version": "2.6.6" + "version": "2.6.9" } diff --git a/nodejs/node_modules/debug/src/browser.js b/nodejs/node_modules/debug/src/browser.js index 053f4b898..710692493 100644 --- a/nodejs/node_modules/debug/src/browser.js +++ b/nodejs/node_modules/debug/src/browser.js @@ -46,14 +46,14 @@ function useColors() { // is webkit? http://stackoverflow.com/a/16459606/376773 // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632 - return (typeof document !== 'undefined' && document && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) || + return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) || // is firebug? http://stackoverflow.com/a/398120/376773 - (typeof window !== 'undefined' && window && window.console && (window.console.firebug || (window.console.exception && window.console.table))) || + (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) || // is firefox >= v31? // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages - (typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) || + (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) || // double check webkit in userAgent just in case we are in a worker - (typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/)); + (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/)); } /** diff --git a/nodejs/node_modules/debug/src/inspector-log.js b/nodejs/node_modules/debug/src/inspector-log.js new file mode 100644 index 000000000..60ea6c04a --- /dev/null +++ b/nodejs/node_modules/debug/src/inspector-log.js @@ -0,0 +1,15 @@ +module.exports = inspectorLog; + +// black hole +const nullStream = new (require('stream').Writable)(); +nullStream._write = () => {}; + +/** + * Outputs a `console.log()` to the Node.js Inspector console *only*. + */ +function inspectorLog() { + const stdout = console._stdout; + console._stdout = nullStream; + console.log.apply(console, arguments); + console._stdout = stdout; +} diff --git a/nodejs/node_modules/debug/src/node.js b/nodejs/node_modules/debug/src/node.js index 3c7407b6b..b15109c90 100644 --- a/nodejs/node_modules/debug/src/node.js +++ b/nodejs/node_modules/debug/src/node.js @@ -85,7 +85,9 @@ function useColors() { exports.formatters.o = function(v) { this.inspectOpts.colors = this.useColors; return util.inspect(v, this.inspectOpts) - .replace(/\s*\n\s*/g, ' '); + .split('\n').map(function(str) { + return str.trim() + }).join(' '); }; /** @@ -231,7 +233,12 @@ function createWritableStdioStream (fd) { */ function init (debug) { - debug.inspectOpts = util._extend({}, exports.inspectOpts); + debug.inspectOpts = {}; + + var keys = Object.keys(exports.inspectOpts); + for (var i = 0; i < keys.length; i++) { + debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]]; + } } /** diff --git a/nodejs/node_modules/depd/History.md b/nodejs/node_modules/depd/History.md index ace117154..f0016499d 100644 --- a/nodejs/node_modules/depd/History.md +++ b/nodejs/node_modules/depd/History.md @@ -1,3 +1,9 @@ +1.1.1 / 2017-07-27 +================== + + * Remove unnecessary `Buffer` loading + * Support Node.js 0.6 to 8.x + 1.1.0 / 2015-09-14 ================== diff --git a/nodejs/node_modules/depd/LICENSE b/nodejs/node_modules/depd/LICENSE index 142ede386..84441fbb5 100644 --- a/nodejs/node_modules/depd/LICENSE +++ b/nodejs/node_modules/depd/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (c) 2014-2015 Douglas Christopher Wilson +Copyright (c) 2014-2017 Douglas Christopher Wilson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/nodejs/node_modules/depd/Readme.md b/nodejs/node_modules/depd/Readme.md index 09bb97995..9e7d8726c 100644 --- a/nodejs/node_modules/depd/Readme.md +++ b/nodejs/node_modules/depd/Readme.md @@ -27,6 +27,8 @@ track deprecations. ## API + + ```js var deprecate = require('depd')('my-module') ``` @@ -200,7 +202,7 @@ var deprecate = require('depd')('my-cool-module') // message automatically derived from function name // Object.oldfunction -exports.oldfunction = deprecate.function(function oldfunction() { +exports.oldfunction = deprecate.function(function oldfunction () { // all calls to function are deprecated }) @@ -276,6 +278,6 @@ deprecate.property(exports, 'oldprop', 'oldprop >= 0.10') [coveralls-image]: https://img.shields.io/coveralls/dougwilson/nodejs-depd/master.svg [coveralls-url]: https://coveralls.io/r/dougwilson/nodejs-depd?branch=master [node-image]: https://img.shields.io/node/v/depd.svg -[node-url]: http://nodejs.org/download/ +[node-url]: https://nodejs.org/en/download/ [gratipay-image]: https://img.shields.io/gratipay/dougwilson.svg [gratipay-url]: https://www.gratipay.com/dougwilson/ diff --git a/nodejs/node_modules/depd/index.js b/nodejs/node_modules/depd/index.js index fddcae875..73d81ab54 100644 --- a/nodejs/node_modules/depd/index.js +++ b/nodejs/node_modules/depd/index.js @@ -1,6 +1,6 @@ /*! * depd - * Copyright(c) 2014-2015 Douglas Christopher Wilson + * Copyright(c) 2014-2017 Douglas Christopher Wilson * MIT Licensed */ @@ -28,13 +28,13 @@ var basePath = process.cwd() * Determine if namespace is contained in the string. */ -function containsNamespace(str, namespace) { +function containsNamespace (str, namespace) { var val = str.split(/[ ,]+/) namespace = String(namespace).toLowerCase() - for (var i = 0 ; i < val.length; i++) { - if (!(str = val[i])) continue; + for (var i = 0; i < val.length; i++) { + if (!(str = val[i])) continue // namespace contained if (str === '*' || str.toLowerCase() === namespace) { @@ -49,14 +49,14 @@ function containsNamespace(str, namespace) { * Convert a data descriptor to accessor descriptor. */ -function convertDataDescriptorToAccessor(obj, prop, message) { +function convertDataDescriptorToAccessor (obj, prop, message) { var descriptor = Object.getOwnPropertyDescriptor(obj, prop) var value = descriptor.value - descriptor.get = function getter() { return value } + descriptor.get = function getter () { return value } if (descriptor.writable) { - descriptor.set = function setter(val) { return value = val } + descriptor.set = function setter (val) { return (value = val) } } delete descriptor.value @@ -71,7 +71,7 @@ function convertDataDescriptorToAccessor(obj, prop, message) { * Create arguments string to keep arity. */ -function createArgumentsString(arity) { +function createArgumentsString (arity) { var str = '' for (var i = 0; i < arity; i++) { @@ -85,7 +85,7 @@ function createArgumentsString(arity) { * Create stack string from stack. */ -function createStackString(stack) { +function createStackString (stack) { var str = this.name + ': ' + this.namespace if (this.message) { @@ -103,7 +103,7 @@ function createStackString(stack) { * Create deprecate for namespace in caller. */ -function depd(namespace) { +function depd (namespace) { if (!namespace) { throw new TypeError('argument namespace is required') } @@ -112,7 +112,7 @@ function depd(namespace) { var site = callSiteLocation(stack[1]) var file = site[0] - function deprecate(message) { + function deprecate (message) { // call to self as log log.call(deprecate, message) } @@ -133,7 +133,7 @@ function depd(namespace) { * Determine if namespace is ignored. */ -function isignored(namespace) { +function isignored (namespace) { /* istanbul ignore next: tested in a child processs */ if (process.noDeprecation) { // --no-deprecation support @@ -150,7 +150,7 @@ function isignored(namespace) { * Determine if namespace is traced. */ -function istraced(namespace) { +function istraced (namespace) { /* istanbul ignore next: tested in a child processs */ if (process.traceDeprecation) { // --trace-deprecation support @@ -167,7 +167,7 @@ function istraced(namespace) { * Display deprecation message. */ -function log(message, site) { +function log (message, site) { var haslisteners = eventListenerCount(process, 'deprecation') !== 0 // abort early if no destination @@ -240,15 +240,13 @@ function log(message, site) { : formatPlain var msg = format.call(this, message, caller, stack.slice(i)) process.stderr.write(msg + '\n', 'utf8') - - return } /** * Get call site location as array. */ -function callSiteLocation(callSite) { +function callSiteLocation (callSite) { var file = callSite.getFileName() || '' var line = callSite.getLineNumber() var colm = callSite.getColumnNumber() @@ -269,7 +267,7 @@ function callSiteLocation(callSite) { * Generate a default message from the site. */ -function defaultMessage(site) { +function defaultMessage (site) { var callSite = site.callSite var funcName = site.name @@ -300,12 +298,12 @@ function defaultMessage(site) { * Format deprecation message without color. */ -function formatPlain(msg, caller, stack) { +function formatPlain (msg, caller, stack) { var timestamp = new Date().toUTCString() - var formatted = timestamp - + ' ' + this._namespace - + ' deprecated ' + msg + var formatted = timestamp + + ' ' + this._namespace + + ' deprecated ' + msg // add stack trace if (this._traced) { @@ -327,10 +325,10 @@ function formatPlain(msg, caller, stack) { * Format deprecation message with color. */ -function formatColor(msg, caller, stack) { - var formatted = '\x1b[36;1m' + this._namespace + '\x1b[22;39m' // bold cyan - + ' \x1b[33;1mdeprecated\x1b[22;39m' // bold yellow - + ' \x1b[0m' + msg + '\x1b[39m' // reset +function formatColor (msg, caller, stack) { + var formatted = '\x1b[36;1m' + this._namespace + '\x1b[22;39m' + // bold cyan + ' \x1b[33;1mdeprecated\x1b[22;39m' + // bold yellow + ' \x1b[0m' + msg + '\x1b[39m' // reset // add stack trace if (this._traced) { @@ -352,17 +350,17 @@ function formatColor(msg, caller, stack) { * Format call site location. */ -function formatLocation(callSite) { - return relative(basePath, callSite[0]) - + ':' + callSite[1] - + ':' + callSite[2] +function formatLocation (callSite) { + return relative(basePath, callSite[0]) + + ':' + callSite[1] + + ':' + callSite[2] } /** * Get the stack as array of call sites. */ -function getStack() { +function getStack () { var limit = Error.stackTraceLimit var obj = {} var prep = Error.prepareStackTrace @@ -386,7 +384,7 @@ function getStack() { * Capture call site stack from v8. */ -function prepareObjectStackTrace(obj, stack) { +function prepareObjectStackTrace (obj, stack) { return stack } @@ -394,23 +392,24 @@ function prepareObjectStackTrace(obj, stack) { * Return a wrapped function in a deprecation message. */ -function wrapfunction(fn, message) { +function wrapfunction (fn, message) { if (typeof fn !== 'function') { throw new TypeError('argument fn must be a function') } var args = createArgumentsString(fn.length) - var deprecate = this + var deprecate = this // eslint-disable-line no-unused-vars var stack = getStack() var site = callSiteLocation(stack[1]) site.name = fn.name - var deprecatedfn = eval('(function (' + args + ') {\n' - + '"use strict"\n' - + 'log.call(deprecate, message, site)\n' - + 'return fn.apply(this, arguments)\n' - + '})') + // eslint-disable-next-line no-eval + var deprecatedfn = eval('(function (' + args + ') {\n' + + '"use strict"\n' + + 'log.call(deprecate, message, site)\n' + + 'return fn.apply(this, arguments)\n' + + '})') return deprecatedfn } @@ -419,7 +418,7 @@ function wrapfunction(fn, message) { * Wrap property in a deprecation message. */ -function wrapproperty(obj, prop, message) { +function wrapproperty (obj, prop, message) { if (!obj || (typeof obj !== 'object' && typeof obj !== 'function')) { throw new TypeError('argument obj must be object') } @@ -451,7 +450,7 @@ function wrapproperty(obj, prop, message) { // wrap getter if (typeof get === 'function') { - descriptor.get = function getter() { + descriptor.get = function getter () { log.call(deprecate, message, site) return get.apply(this, arguments) } @@ -459,7 +458,7 @@ function wrapproperty(obj, prop, message) { // wrap setter if (typeof set === 'function') { - descriptor.set = function setter() { + descriptor.set = function setter () { log.call(deprecate, message, site) return set.apply(this, arguments) } @@ -472,7 +471,7 @@ function wrapproperty(obj, prop, message) { * Create DeprecationError for deprecation */ -function DeprecationError(namespace, message, stack) { +function DeprecationError (namespace, message, stack) { var error = new Error() var stackString @@ -510,9 +509,9 @@ function DeprecationError(namespace, message, stack) { } // prepare stack trace - return stackString = createStackString.call(this, stack) + return (stackString = createStackString.call(this, stack)) }, - set: function setter(val) { + set: function setter (val) { stackString = val } }) diff --git a/nodejs/node_modules/depd/lib/browser/index.js b/nodejs/node_modules/depd/lib/browser/index.js index f464e0525..6be45cc20 100644 --- a/nodejs/node_modules/depd/lib/browser/index.js +++ b/nodejs/node_modules/depd/lib/browser/index.js @@ -17,12 +17,12 @@ module.exports = depd * Create deprecate for namespace in caller. */ -function depd(namespace) { +function depd (namespace) { if (!namespace) { throw new TypeError('argument namespace is required') } - function deprecate(message) { + function deprecate (message) { // no-op in browser } @@ -45,7 +45,7 @@ function depd(namespace) { * validation. */ -function wrapfunction(fn, message) { +function wrapfunction (fn, message) { if (typeof fn !== 'function') { throw new TypeError('argument fn must be a function') } @@ -60,7 +60,7 @@ function wrapfunction(fn, message) { * validation. */ -function wrapproperty(obj, prop, message) { +function wrapproperty (obj, prop, message) { if (!obj || (typeof obj !== 'object' && typeof obj !== 'function')) { throw new TypeError('argument obj must be object') } @@ -74,6 +74,4 @@ function wrapproperty(obj, prop, message) { if (!descriptor.configurable) { throw new TypeError('property must be configurable') } - - return } diff --git a/nodejs/node_modules/depd/lib/compat/buffer-concat.js b/nodejs/node_modules/depd/lib/compat/buffer-concat.js deleted file mode 100644 index 4b7338102..000000000 --- a/nodejs/node_modules/depd/lib/compat/buffer-concat.js +++ /dev/null @@ -1,35 +0,0 @@ -/*! - * depd - * Copyright(c) 2014 Douglas Christopher Wilson - * MIT Licensed - */ - -'use strict' - -/** - * Module exports. - */ - -module.exports = bufferConcat - -/** - * Concatenate an array of Buffers. - */ - -function bufferConcat(bufs) { - var length = 0 - - for (var i = 0, len = bufs.length; i < len; i++) { - length += bufs[i].length - } - - var buf = new Buffer(length) - var pos = 0 - - for (var i = 0, len = bufs.length; i < len; i++) { - bufs[i].copy(buf, pos) - pos += bufs[i].length - } - - return buf -} diff --git a/nodejs/node_modules/depd/lib/compat/callsite-tostring.js b/nodejs/node_modules/depd/lib/compat/callsite-tostring.js index 9ecef3466..73186dc64 100644 --- a/nodejs/node_modules/depd/lib/compat/callsite-tostring.js +++ b/nodejs/node_modules/depd/lib/compat/callsite-tostring.js @@ -16,7 +16,7 @@ module.exports = callSiteToString * Format a CallSite file location to a string. */ -function callSiteFileLocation(callSite) { +function callSiteFileLocation (callSite) { var fileName var fileLocation = '' @@ -52,7 +52,7 @@ function callSiteFileLocation(callSite) { * Format a CallSite to a string. */ -function callSiteToString(callSite) { +function callSiteToString (callSite) { var addSuffix = true var fileLocation = callSiteFileLocation(callSite) var functionName = callSite.getFunctionName() @@ -97,7 +97,7 @@ function callSiteToString(callSite) { * Get constructor name of reviver. */ -function getConstructorName(obj) { +function getConstructorName (obj) { var receiver = obj.receiver return (receiver.constructor && receiver.constructor.name) || null } diff --git a/nodejs/node_modules/depd/lib/compat/event-listener-count.js b/nodejs/node_modules/depd/lib/compat/event-listener-count.js index a05fceb79..3a8925d13 100644 --- a/nodejs/node_modules/depd/lib/compat/event-listener-count.js +++ b/nodejs/node_modules/depd/lib/compat/event-listener-count.js @@ -17,6 +17,6 @@ module.exports = eventListenerCount * Get the count of listeners on an event emitter of a specific type. */ -function eventListenerCount(emitter, type) { +function eventListenerCount (emitter, type) { return emitter.listeners(type).length } diff --git a/nodejs/node_modules/depd/lib/compat/index.js b/nodejs/node_modules/depd/lib/compat/index.js index aa3c1de43..955b3336b 100644 --- a/nodejs/node_modules/depd/lib/compat/index.js +++ b/nodejs/node_modules/depd/lib/compat/index.js @@ -11,7 +11,6 @@ * @private */ -var Buffer = require('buffer') var EventEmitter = require('events').EventEmitter /** @@ -19,16 +18,12 @@ var EventEmitter = require('events').EventEmitter * @public */ -lazyProperty(module.exports, 'bufferConcat', function bufferConcat() { - return Buffer.concat || require('./buffer-concat') -}) - -lazyProperty(module.exports, 'callSiteToString', function callSiteToString() { +lazyProperty(module.exports, 'callSiteToString', function callSiteToString () { var limit = Error.stackTraceLimit var obj = {} var prep = Error.prepareStackTrace - function prepareObjectStackTrace(obj, stack) { + function prepareObjectStackTrace (obj, stack) { return stack } @@ -47,7 +42,7 @@ lazyProperty(module.exports, 'callSiteToString', function callSiteToString() { return stack[0].toString ? toString : require('./callsite-tostring') }) -lazyProperty(module.exports, 'eventListenerCount', function eventListenerCount() { +lazyProperty(module.exports, 'eventListenerCount', function eventListenerCount () { return EventEmitter.listenerCount || require('./event-listener-count') }) @@ -55,8 +50,8 @@ lazyProperty(module.exports, 'eventListenerCount', function eventListenerCount() * Define a lazy property. */ -function lazyProperty(obj, prop, getter) { - function get() { +function lazyProperty (obj, prop, getter) { + function get () { var val = getter() Object.defineProperty(obj, prop, { @@ -79,6 +74,6 @@ function lazyProperty(obj, prop, getter) { * Call toString() on the obj */ -function toString(obj) { +function toString (obj) { return obj.toString() } diff --git a/nodejs/node_modules/depd/package.json b/nodejs/node_modules/depd/package.json index b8458dea4..d0b5e4109 100644 --- a/nodejs/node_modules/depd/package.json +++ b/nodejs/node_modules/depd/package.json @@ -1,47 +1,35 @@ { "_args": [ [ - { - "raw": "depd@~1.1.0", - "scope": null, - "escapedName": "depd", - "name": "depd", - "rawSpec": "~1.1.0", - "spec": ">=1.1.0 <1.2.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "depd@1.1.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "depd@>=1.1.0 <1.2.0", - "_id": "depd@1.1.0", - "_inCache": true, + "_from": "depd@1.1.1", + "_id": "depd@1.1.1", + "_inBundle": false, + "_integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", "_location": "/depd", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "depd@~1.1.0", - "scope": null, - "escapedName": "depd", + "type": "version", + "registry": true, + "raw": "depd@1.1.1", "name": "depd", - "rawSpec": "~1.1.0", - "spec": ">=1.1.0 <1.2.0", - "type": "range" + "escapedName": "depd", + "rawSpec": "1.1.1", + "saveSpec": null, + "fetchSpec": "1.1.1" }, "_requiredBy": [ + "/body-parser", "/express", "/http-errors", "/send" ], - "_resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", - "_shasum": "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3", - "_shrinkwrap": null, - "_spec": "depd@~1.1.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "_spec": "1.1.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" @@ -50,19 +38,18 @@ "bugs": { "url": "https://github.com/dougwilson/nodejs-depd/issues" }, - "dependencies": {}, "description": "Deprecate all the things", "devDependencies": { "beautify-benchmark": "0.2.4", - "benchmark": "1.0.0", - "istanbul": "0.3.5", + "benchmark": "2.1.4", + "eslint": "3.19.0", + "eslint-config-standard": "7.1.0", + "eslint-plugin-markdown": "1.0.0-beta.7", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "2.3.1", + "istanbul": "0.4.5", "mocha": "~1.21.5" }, - "directories": {}, - "dist": { - "shasum": "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3", - "tarball": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -73,31 +60,23 @@ "index.js", "Readme.md" ], - "gitHead": "78c659de20283e3a6bee92bda455e6daff01686a", - "homepage": "https://github.com/dougwilson/nodejs-depd", + "homepage": "https://github.com/dougwilson/nodejs-depd#readme", "keywords": [ "deprecate", "deprecated" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "depd", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/dougwilson/nodejs-depd.git" }, "scripts": { "bench": "node benchmark/index.js", + "lint": "eslint --plugin markdown --ext js,md .", "test": "mocha --reporter spec --bail test/", "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --no-exit test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot test/" }, - "version": "1.1.0" + "version": "1.1.1" } diff --git a/nodejs/node_modules/destroy/package.json b/nodejs/node_modules/destroy/package.json index d7e451b2c..75fb52660 100644 --- a/nodejs/node_modules/destroy/package.json +++ b/nodejs/node_modules/destroy/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "destroy@~1.0.4", - "scope": null, - "escapedName": "destroy", - "name": "destroy", - "rawSpec": "~1.0.4", - "spec": ">=1.0.4 <1.1.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/send" + "destroy@1.0.4", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "destroy@>=1.0.4 <1.1.0", + "_from": "destroy@1.0.4", "_id": "destroy@1.0.4", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", "_location": "/destroy", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "destroy@~1.0.4", - "scope": null, - "escapedName": "destroy", + "type": "version", + "registry": true, + "raw": "destroy@1.0.4", "name": "destroy", - "rawSpec": "~1.0.4", - "spec": ">=1.0.4 <1.1.0", - "type": "range" + "escapedName": "destroy", + "rawSpec": "1.0.4", + "saveSpec": null, + "fetchSpec": "1.0.4" }, "_requiredBy": [ "/send" ], "_resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "_shasum": "978857442c44749e4206613e37946205826abd80", - "_shrinkwrap": null, - "_spec": "destroy@~1.0.4", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/send", + "_spec": "1.0.4", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Jonathan Ong", "email": "me@jongleberry.com", @@ -54,23 +41,16 @@ "email": "doug@somethingdoug.com" } ], - "dependencies": {}, "description": "destroy a stream if possible", "devDependencies": { "istanbul": "0.4.2", "mocha": "2.3.4" }, - "directories": {}, - "dist": { - "shasum": "978857442c44749e4206613e37946205826abd80", - "tarball": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz" - }, "files": [ "index.js", "LICENSE" ], - "gitHead": "86edea01456f5fa1027f6a47250c34c713cbcc3b", - "homepage": "https://github.com/stream-utils/destroy", + "homepage": "https://github.com/stream-utils/destroy#readme", "keywords": [ "stream", "streams", @@ -80,19 +60,7 @@ "fd" ], "license": "MIT", - "maintainers": [ - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "destroy", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/stream-utils/destroy.git" diff --git a/nodejs/node_modules/ee-first/package.json b/nodejs/node_modules/ee-first/package.json index 451bca243..8920337ea 100644 --- a/nodejs/node_modules/ee-first/package.json +++ b/nodejs/node_modules/ee-first/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "ee-first@1.1.1", - "scope": null, - "escapedName": "ee-first", - "name": "ee-first", - "rawSpec": "1.1.1", - "spec": "1.1.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/on-finished" + "ee-first@1.1.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "ee-first@1.1.1", "_id": "ee-first@1.1.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "_location": "/ee-first", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "ee-first@1.1.1", - "scope": null, - "escapedName": "ee-first", "name": "ee-first", + "escapedName": "ee-first", "rawSpec": "1.1.1", - "spec": "1.1.1", - "type": "version" + "saveSpec": null, + "fetchSpec": "1.1.1" }, "_requiredBy": [ "/on-finished" ], "_resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "_shasum": "590c61156b0ae2f4f0255732a158b266bc56b21d", - "_shrinkwrap": null, - "_spec": "ee-first@1.1.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/on-finished", + "_spec": "1.1.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Jonathan Ong", "email": "me@jongleberry.com", @@ -54,37 +41,18 @@ "email": "doug@somethingdoug.com" } ], - "dependencies": {}, "description": "return the first event in a set of ee/event pairs", "devDependencies": { "istanbul": "0.3.9", "mocha": "2.2.5" }, - "directories": {}, - "dist": { - "shasum": "590c61156b0ae2f4f0255732a158b266bc56b21d", - "tarball": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" - }, "files": [ "index.js", "LICENSE" ], - "gitHead": "512e0ce4cc3643f603708f965a97b61b1a9c0441", - "homepage": "https://github.com/jonathanong/ee-first", + "homepage": "https://github.com/jonathanong/ee-first#readme", "license": "MIT", - "maintainers": [ - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "ee-first", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jonathanong/ee-first.git" diff --git a/nodejs/node_modules/encodeurl/package.json b/nodejs/node_modules/encodeurl/package.json index c55367d2a..5ed89a38b 100644 --- a/nodejs/node_modules/encodeurl/package.json +++ b/nodejs/node_modules/encodeurl/package.json @@ -1,41 +1,25 @@ { "_args": [ [ - { - "raw": "encodeurl@~1.0.1", - "scope": null, - "escapedName": "encodeurl", - "name": "encodeurl", - "rawSpec": "~1.0.1", - "spec": ">=1.0.1 <1.1.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "encodeurl@1.0.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "encodeurl@>=1.0.1 <1.1.0", + "_from": "encodeurl@1.0.1", "_id": "encodeurl@1.0.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=", "_location": "/encodeurl", - "_nodeVersion": "4.4.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/encodeurl-1.0.1.tgz_1465519736251_0.09314409433864057" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.1", "_phantomChildren": {}, "_requested": { - "raw": "encodeurl@~1.0.1", - "scope": null, - "escapedName": "encodeurl", + "type": "version", + "registry": true, + "raw": "encodeurl@1.0.1", "name": "encodeurl", - "rawSpec": "~1.0.1", - "spec": ">=1.0.1 <1.1.0", - "type": "range" + "escapedName": "encodeurl", + "rawSpec": "1.0.1", + "saveSpec": null, + "fetchSpec": "1.0.1" }, "_requiredBy": [ "/express", @@ -44,10 +28,8 @@ "/serve-static" ], "_resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", - "_shasum": "79e3d58655346909fe6f0f45a5de68103b294d20", - "_shrinkwrap": null, - "_spec": "encodeurl@~1.0.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.0.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/pillarjs/encodeurl/issues" }, @@ -57,7 +39,6 @@ "email": "doug@somethingdoug.com" } ], - "dependencies": {}, "description": "Encode a URL to a percent-encoded form, excluding already-encoded sequences", "devDependencies": { "eslint": "2.11.1", @@ -67,11 +48,6 @@ "istanbul": "0.4.3", "mocha": "2.5.3" }, - "directories": {}, - "dist": { - "shasum": "79e3d58655346909fe6f0f45a5de68103b294d20", - "tarball": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz" - }, "engines": { "node": ">= 0.8" }, @@ -81,7 +57,6 @@ "README.md", "index.js" ], - "gitHead": "39ed0c235fed4cea7d012038fd6bb0480561d226", "homepage": "https://github.com/pillarjs/encodeurl#readme", "keywords": [ "encode", @@ -89,15 +64,7 @@ "url" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "encodeurl", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/pillarjs/encodeurl.git" diff --git a/nodejs/node_modules/escape-html/package.json b/nodejs/node_modules/escape-html/package.json index bbeab5d78..d18336138 100644 --- a/nodejs/node_modules/escape-html/package.json +++ b/nodejs/node_modules/escape-html/package.json @@ -1,36 +1,25 @@ { "_args": [ [ - { - "raw": "escape-html@~1.0.3", - "scope": null, - "escapedName": "escape-html", - "name": "escape-html", - "rawSpec": "~1.0.3", - "spec": ">=1.0.3 <1.1.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "escape-html@1.0.3", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "escape-html@>=1.0.3 <1.1.0", + "_from": "escape-html@1.0.3", "_id": "escape-html@1.0.3", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", "_location": "/escape-html", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "escape-html@~1.0.3", - "scope": null, - "escapedName": "escape-html", + "type": "version", + "registry": true, + "raw": "escape-html@1.0.3", "name": "escape-html", - "rawSpec": "~1.0.3", - "spec": ">=1.0.3 <1.1.0", - "type": "range" + "escapedName": "escape-html", + "rawSpec": "1.0.3", + "saveSpec": null, + "fetchSpec": "1.0.3" }, "_requiredBy": [ "/express", @@ -39,50 +28,29 @@ "/serve-static" ], "_resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "_shasum": "0258eae4d3d0c0974de1c169188ef0051d1d1988", - "_shrinkwrap": null, - "_spec": "escape-html@~1.0.3", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.0.3", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/component/escape-html/issues" }, - "dependencies": {}, "description": "Escape string for use in HTML", "devDependencies": { "beautify-benchmark": "0.2.4", "benchmark": "1.0.0" }, - "directories": {}, - "dist": { - "shasum": "0258eae4d3d0c0974de1c169188ef0051d1d1988", - "tarball": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" - }, "files": [ "LICENSE", "Readme.md", "index.js" ], - "gitHead": "7ac2ea3977fcac3d4c5be8d2a037812820c65f28", - "homepage": "https://github.com/component/escape-html", + "homepage": "https://github.com/component/escape-html#readme", "keywords": [ "escape", "html", "utility" ], "license": "MIT", - "maintainers": [ - { - "name": "tjholowaychuk", - "email": "tj@vision-media.ca" - }, - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "escape-html", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/component/escape-html.git" diff --git a/nodejs/node_modules/escape-string-regexp/package.json b/nodejs/node_modules/escape-string-regexp/package.json index 8669c3add..b01780a03 100644 --- a/nodejs/node_modules/escape-string-regexp/package.json +++ b/nodejs/node_modules/escape-string-regexp/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "escape-string-regexp@^1.0.0", - "scope": null, - "escapedName": "escape-string-regexp", - "name": "escape-string-regexp", - "rawSpec": "^1.0.0", - "spec": ">=1.0.0 <2.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk" + "escape-string-regexp@1.0.5", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "escape-string-regexp@>=1.0.0 <2.0.0", + "_from": "escape-string-regexp@1.0.5", "_id": "escape-string-regexp@1.0.5", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "_location": "/escape-string-regexp", - "_nodeVersion": "4.2.6", - "_npmOperationalInternal": { - "host": "packages-9-west.internal.npmjs.com", - "tmp": "tmp/escape-string-regexp-1.0.5.tgz_1456059312074_0.7245344955008477" - }, - "_npmUser": { - "name": "jbnicolai", - "email": "jappelman@xebia.com" - }, - "_npmVersion": "2.14.12", "_phantomChildren": {}, "_requested": { - "raw": "escape-string-regexp@^1.0.0", - "scope": null, - "escapedName": "escape-string-regexp", + "type": "version", + "registry": true, + "raw": "escape-string-regexp@1.0.5", "name": "escape-string-regexp", - "rawSpec": "^1.0.0", - "spec": ">=1.0.0 <2.0.0", - "type": "range" + "escapedName": "escape-string-regexp", + "rawSpec": "1.0.5", + "saveSpec": null, + "fetchSpec": "1.0.5" }, "_requiredBy": [ "/chalk" ], "_resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "_shasum": "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4", - "_shrinkwrap": null, - "_spec": "escape-string-regexp@^1.0.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk", + "_spec": "1.0.5", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -53,25 +35,18 @@ "bugs": { "url": "https://github.com/sindresorhus/escape-string-regexp/issues" }, - "dependencies": {}, "description": "Escape RegExp special characters", "devDependencies": { "ava": "*", "xo": "*" }, - "directories": {}, - "dist": { - "shasum": "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4", - "tarball": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - }, "engines": { "node": ">=0.8.0" }, "files": [ "index.js" ], - "gitHead": "db124a3e1aae9d692c4899e42a5c6c3e329eaa20", - "homepage": "https://github.com/sindresorhus/escape-string-regexp", + "homepage": "https://github.com/sindresorhus/escape-string-regexp#readme", "keywords": [ "escape", "regex", @@ -87,17 +62,17 @@ "license": "MIT", "maintainers": [ { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" + "name": "Sindre Sorhus", + "email": "sindresorhus@gmail.com", + "url": "sindresorhus.com" }, { - "name": "jbnicolai", - "email": "jappelman@xebia.com" + "name": "Joshua Boy Nicolai Appelman", + "email": "joshua@jbna.nl", + "url": "jbna.nl" } ], "name": "escape-string-regexp", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/sindresorhus/escape-string-regexp.git" diff --git a/nodejs/node_modules/etag/HISTORY.md b/nodejs/node_modules/etag/HISTORY.md index 136da8c69..222b293de 100644 --- a/nodejs/node_modules/etag/HISTORY.md +++ b/nodejs/node_modules/etag/HISTORY.md @@ -1,3 +1,8 @@ +1.8.1 / 2017-09-12 +================== + + * perf: replace regular expression with substring + 1.8.0 / 2017-02-18 ================== diff --git a/nodejs/node_modules/etag/README.md b/nodejs/node_modules/etag/README.md index 9963a5fc4..09c2169e7 100644 --- a/nodejs/node_modules/etag/README.md +++ b/nodejs/node_modules/etag/README.md @@ -23,7 +23,7 @@ $ npm install etag ## API - + ```js var etag = require('etag') @@ -36,7 +36,7 @@ body of the entity. Strings, `Buffer`s, and `fs.Stats` are accepted. By default, a strong ETag is generated except for `fs.Stats`, which will generate a weak ETag (this can be overwritten by `options.weak`). - + ```js res.setHeader('ETag', etag(body)) @@ -63,18 +63,18 @@ $ npm test ```bash $ npm run-script bench -> etag@1.8.0 bench nodejs-etag +> etag@1.8.1 bench nodejs-etag > node benchmark/index.js http_parser@2.7.0 - node@6.9.1 - v8@5.1.281.84 - uv@1.9.1 - zlib@1.2.8 + node@6.11.1 + v8@5.1.281.103 + uv@1.11.0 + zlib@1.2.11 ares@1.10.1-DEV - icu@57.1 + icu@58.2 modules@48 - openssl@1.0.2j + openssl@1.0.2k > node benchmark/body0-100b.js @@ -82,10 +82,10 @@ $ npm run-script bench 4 tests completed. -* buffer - strong x 498,600 ops/sec ±0.82% (191 runs sampled) -* buffer - weak x 496,249 ops/sec ±0.59% (179 runs sampled) - string - strong x 466,298 ops/sec ±0.88% (186 runs sampled) - string - weak x 464,298 ops/sec ±0.84% (184 runs sampled) + buffer - strong x 258,647 ops/sec ±1.07% (180 runs sampled) + buffer - weak x 263,812 ops/sec ±0.61% (184 runs sampled) + string - strong x 259,955 ops/sec ±1.19% (185 runs sampled) + string - weak x 264,356 ops/sec ±1.09% (184 runs sampled) > node benchmark/body1-1kb.js @@ -93,10 +93,10 @@ $ npm run-script bench 4 tests completed. -* buffer - strong x 346,535 ops/sec ±0.32% (189 runs sampled) -* buffer - weak x 344,958 ops/sec ±0.52% (185 runs sampled) - string - strong x 259,672 ops/sec ±0.82% (191 runs sampled) - string - weak x 260,931 ops/sec ±0.76% (190 runs sampled) + buffer - strong x 189,018 ops/sec ±1.12% (182 runs sampled) + buffer - weak x 190,586 ops/sec ±0.81% (186 runs sampled) + string - strong x 144,272 ops/sec ±0.96% (188 runs sampled) + string - weak x 145,380 ops/sec ±1.43% (187 runs sampled) > node benchmark/body2-5kb.js @@ -104,10 +104,10 @@ $ npm run-script bench 4 tests completed. -* buffer - strong x 136,510 ops/sec ±0.62% (189 runs sampled) -* buffer - weak x 136,604 ops/sec ±0.51% (191 runs sampled) - string - strong x 80,903 ops/sec ±0.84% (192 runs sampled) - string - weak x 82,785 ops/sec ±0.50% (193 runs sampled) + buffer - strong x 92,435 ops/sec ±0.42% (188 runs sampled) + buffer - weak x 92,373 ops/sec ±0.58% (189 runs sampled) + string - strong x 48,850 ops/sec ±0.56% (186 runs sampled) + string - weak x 49,380 ops/sec ±0.56% (190 runs sampled) > node benchmark/body3-10kb.js @@ -115,10 +115,10 @@ $ npm run-script bench 4 tests completed. -* buffer - strong x 78,650 ops/sec ±0.31% (193 runs sampled) -* buffer - weak x 78,685 ops/sec ±0.41% (193 runs sampled) - string - strong x 43,999 ops/sec ±0.43% (193 runs sampled) - string - weak x 44,081 ops/sec ±0.45% (192 runs sampled) + buffer - strong x 55,989 ops/sec ±0.93% (188 runs sampled) + buffer - weak x 56,148 ops/sec ±0.55% (190 runs sampled) + string - strong x 27,345 ops/sec ±0.43% (188 runs sampled) + string - weak x 27,496 ops/sec ±0.45% (190 runs sampled) > node benchmark/body4-100kb.js @@ -126,10 +126,10 @@ $ npm run-script bench 4 tests completed. - buffer - strong x 8,860 ops/sec ±0.66% (191 runs sampled) -* buffer - weak x 9,030 ops/sec ±0.26% (193 runs sampled) - string - strong x 4,838 ops/sec ±0.16% (194 runs sampled) - string - weak x 4,800 ops/sec ±0.52% (192 runs sampled) + buffer - strong x 7,083 ops/sec ±0.22% (190 runs sampled) + buffer - weak x 7,115 ops/sec ±0.26% (191 runs sampled) + string - strong x 3,068 ops/sec ±0.34% (190 runs sampled) + string - weak x 3,096 ops/sec ±0.35% (190 runs sampled) > node benchmark/stats.js @@ -137,10 +137,10 @@ $ npm run-script bench 4 tests completed. -* real - strong x 1,468,073 ops/sec ±0.32% (191 runs sampled) -* real - weak x 1,446,852 ops/sec ±0.64% (190 runs sampled) - fake - strong x 635,707 ops/sec ±0.33% (194 runs sampled) - fake - weak x 627,708 ops/sec ±0.36% (192 runs sampled) + real - strong x 871,642 ops/sec ±0.34% (189 runs sampled) + real - weak x 867,613 ops/sec ±0.39% (190 runs sampled) + fake - strong x 401,051 ops/sec ±0.40% (189 runs sampled) + fake - weak x 400,100 ops/sec ±0.47% (188 runs sampled) ``` ## License diff --git a/nodejs/node_modules/etag/index.js b/nodejs/node_modules/etag/index.js index 607f1488e..2a585c91f 100644 --- a/nodejs/node_modules/etag/index.js +++ b/nodejs/node_modules/etag/index.js @@ -26,7 +26,6 @@ var Stats = require('fs').Stats * @private */ -var base64PadCharRegExp = /=+$/ var toString = Object.prototype.toString /** @@ -48,7 +47,7 @@ function entitytag (entity) { .createHash('sha1') .update(entity, 'utf8') .digest('base64') - .replace(base64PadCharRegExp, '') + .substring(0, 27) // compute length of entity var len = typeof entity === 'string' diff --git a/nodejs/node_modules/etag/package.json b/nodejs/node_modules/etag/package.json index 4305d5f4c..2732aa2a5 100644 --- a/nodejs/node_modules/etag/package.json +++ b/nodejs/node_modules/etag/package.json @@ -1,51 +1,33 @@ { "_args": [ [ - { - "raw": "etag@~1.8.0", - "scope": null, - "escapedName": "etag", - "name": "etag", - "rawSpec": "~1.8.0", - "spec": ">=1.8.0 <1.9.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "etag@1.8.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "etag@>=1.8.0 <1.9.0", - "_id": "etag@1.8.0", - "_inCache": true, + "_from": "etag@1.8.1", + "_id": "etag@1.8.1", + "_inBundle": false, + "_integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "_location": "/etag", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/etag-1.8.0.tgz_1487475735517_0.6724899658001959" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "etag@~1.8.0", - "scope": null, - "escapedName": "etag", + "type": "version", + "registry": true, + "raw": "etag@1.8.1", "name": "etag", - "rawSpec": "~1.8.0", - "spec": ">=1.8.0 <1.9.0", - "type": "range" + "escapedName": "etag", + "rawSpec": "1.8.1", + "saveSpec": null, + "fetchSpec": "1.8.1" }, "_requiredBy": [ "/express", "/send" ], - "_resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz", - "_shasum": "6f631aef336d6c46362b51764044ce216be3c051", - "_shrinkwrap": null, - "_spec": "etag@~1.8.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "_spec": "1.8.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/etag/issues" }, @@ -59,24 +41,21 @@ "email": "david.bjorklund@gmail.com" } ], - "dependencies": {}, "description": "Create simple HTTP ETags", "devDependencies": { "beautify-benchmark": "0.2.4", - "benchmark": "2.1.3", - "eslint": "3.15.0", - "eslint-config-standard": "6.2.1", - "eslint-plugin-markdown": "1.0.0-beta.3", - "eslint-plugin-promise": "3.4.2", - "eslint-plugin-standard": "2.0.1", + "benchmark": "2.1.4", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", "istanbul": "0.4.5", "mocha": "1.21.5", - "seedrandom": "2.4.2" - }, - "directories": {}, - "dist": { - "shasum": "6f631aef336d6c46362b51764044ce216be3c051", - "tarball": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz" + "safe-buffer": "5.1.1", + "seedrandom": "2.4.3" }, "engines": { "node": ">= 0.6" @@ -87,7 +66,6 @@ "README.md", "index.js" ], - "gitHead": "16979f788efa8c793c8d07543b4d6aef3d2bfff8", "homepage": "https://github.com/jshttp/etag#readme", "keywords": [ "etag", @@ -95,15 +73,7 @@ "res" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "etag", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/etag.git" @@ -115,5 +85,5 @@ "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/", "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/" }, - "version": "1.8.0" + "version": "1.8.1" } diff --git a/nodejs/node_modules/express/History.md b/nodejs/node_modules/express/History.md index 5bfd5690a..fbf59a234 100644 --- a/nodejs/node_modules/express/History.md +++ b/nodejs/node_modules/express/History.md @@ -1,3 +1,129 @@ +4.16.2 / 2017-10-09 +=================== + + * Fix `TypeError` in `res.send` when given `Buffer` and `ETag` header set + * perf: skip parsing of entire `X-Forwarded-Proto` header + +4.16.1 / 2017-09-29 +=================== + + * deps: send@0.16.1 + * deps: serve-static@1.13.1 + - Fix regression when `root` is incorrectly set to a file + - deps: send@0.16.1 + +4.16.0 / 2017-09-28 +=================== + + * Add `"json escape"` setting for `res.json` and `res.jsonp` + * Add `express.json` and `express.urlencoded` to parse bodies + * Add `options` argument to `res.download` + * Improve error message when autoloading invalid view engine + * Improve error messages when non-function provided as middleware + * Skip `Buffer` encoding when not generating ETag for small response + * Use `safe-buffer` for improved Buffer API + * deps: accepts@~1.3.4 + - deps: mime-types@~2.1.16 + * deps: content-type@~1.0.4 + - perf: remove argument reassignment + - perf: skip parameter parsing when no parameters + * deps: etag@~1.8.1 + - perf: replace regular expression with substring + * deps: finalhandler@1.1.0 + - Use `res.headersSent` when available + * deps: parseurl@~1.3.2 + - perf: reduce overhead for full URLs + - perf: unroll the "fast-path" `RegExp` + * deps: proxy-addr@~2.0.2 + - Fix trimming leading / trailing OWS in `X-Forwarded-For` + - deps: forwarded@~0.1.2 + - deps: ipaddr.js@1.5.2 + - perf: reduce overhead when no `X-Forwarded-For` header + * deps: qs@6.5.1 + - Fix parsing & compacting very deep objects + * deps: send@0.16.0 + - Add 70 new types for file extensions + - Add `immutable` option + - Fix missing `` in default error & redirects + - Set charset as "UTF-8" for .js and .json + - Use instance methods on steam to check for listeners + - deps: mime@1.4.1 + - perf: improve path validation speed + * deps: serve-static@1.13.0 + - Add 70 new types for file extensions + - Add `immutable` option + - Set charset as "UTF-8" for .js and .json + - deps: send@0.16.0 + * deps: setprototypeof@1.1.0 + * deps: utils-merge@1.0.1 + * deps: vary@~1.1.2 + - perf: improve header token parsing speed + * perf: re-use options object when generating ETags + * perf: remove dead `.charset` set in `res.jsonp` + +4.15.5 / 2017-09-24 +=================== + + * deps: debug@2.6.9 + * deps: finalhandler@~1.0.6 + - deps: debug@2.6.9 + - deps: parseurl@~1.3.2 + * deps: fresh@0.5.2 + - Fix handling of modified headers with invalid dates + - perf: improve ETag match loop + - perf: improve `If-None-Match` token parsing + * deps: send@0.15.6 + - Fix handling of modified headers with invalid dates + - deps: debug@2.6.9 + - deps: etag@~1.8.1 + - deps: fresh@0.5.2 + - perf: improve `If-Match` token parsing + * deps: serve-static@1.12.6 + - deps: parseurl@~1.3.2 + - deps: send@0.15.6 + - perf: improve slash collapsing + +4.15.4 / 2017-08-06 +=================== + + * deps: debug@2.6.8 + * deps: depd@~1.1.1 + - Remove unnecessary `Buffer` loading + * deps: finalhandler@~1.0.4 + - deps: debug@2.6.8 + * deps: proxy-addr@~1.1.5 + - Fix array argument being altered + - deps: ipaddr.js@1.4.0 + * deps: qs@6.5.0 + * deps: send@0.15.4 + - deps: debug@2.6.8 + - deps: depd@~1.1.1 + - deps: http-errors@~1.6.2 + * deps: serve-static@1.12.4 + - deps: send@0.15.4 + +4.15.3 / 2017-05-16 +=================== + + * Fix error when `res.set` cannot add charset to `Content-Type` + * deps: debug@2.6.7 + - Fix `DEBUG_MAX_ARRAY_LENGTH` + - deps: ms@2.0.0 + * deps: finalhandler@~1.0.3 + - Fix missing `` in HTML document + - deps: debug@2.6.7 + * deps: proxy-addr@~1.1.4 + - deps: ipaddr.js@1.3.0 + * deps: send@0.15.3 + - deps: debug@2.6.7 + - deps: ms@2.0.0 + * deps: serve-static@1.12.3 + - deps: send@0.15.3 + * deps: type-is@~1.6.15 + - deps: mime-types@~2.1.15 + * deps: vary@~1.1.1 + - perf: hoist regular expression + 4.15.2 / 2017-03-06 =================== diff --git a/nodejs/node_modules/express/Readme.md b/nodejs/node_modules/express/Readme.md index 0ddc68fdc..3cd220325 100644 --- a/nodejs/node_modules/express/Readme.md +++ b/nodejs/node_modules/express/Readme.md @@ -21,10 +21,22 @@ app.listen(3000) ## Installation +This is a [Node.js](https://nodejs.org/en/) module available through the +[npm registry](https://www.npmjs.com/). + +Before installing, [download and install Node.js](https://nodejs.org/en/download/). +Node.js 0.10 or higher is required. + +Installation is done using the +[`npm install` command](https://docs.npmjs.com/getting-started/installing-npm-packages-locally): + ```bash $ npm install express ``` +Follow [our installing guide](http://expressjs.com/en/starter/installing.html) +for more information. + ## Features * Robust routing @@ -39,15 +51,14 @@ $ npm install express * [Website and Documentation](http://expressjs.com/) - [[website repo](https://github.com/expressjs/expressjs.com)] * [#express](https://webchat.freenode.net/?channels=express) on freenode IRC - * [Github Organization](https://github.com/expressjs) for Official Middleware & Modules + * [GitHub Organization](https://github.com/expressjs) for Official Middleware & Modules * Visit the [Wiki](https://github.com/expressjs/express/wiki) * [Google Group](https://groups.google.com/group/express-js) for discussion * [Gitter](https://gitter.im/expressjs/express) for support and discussion - * [Русскоязычная документация](http://jsman.ru/express/) **PROTIP** Be sure to read [Migrating from 3.x to 4.x](https://github.com/expressjs/express/wiki/Migrating-from-3.x-to-4.x) as well as [New features in 4.x](https://github.com/expressjs/express/wiki/New-features-in-4.x). -###Security Issues +### Security Issues If you discover a security vulnerability in Express, please see [Security Policies and Procedures](Security.md). diff --git a/nodejs/node_modules/express/lib/application.js b/nodejs/node_modules/express/lib/application.js index 21a81ee9e..91f77d241 100644 --- a/nodejs/node_modules/express/lib/application.js +++ b/nodejs/node_modules/express/lib/application.js @@ -28,7 +28,7 @@ var deprecate = require('depd')('express'); var flatten = require('array-flatten'); var merge = require('utils-merge'); var resolve = require('path').resolve; -var setPrototyeOf = require('setprototypeof') +var setPrototypeOf = require('setprototypeof') var slice = Array.prototype.slice; /** @@ -95,10 +95,10 @@ app.defaultConfiguration = function defaultConfiguration() { } // inherit protos - setPrototyeOf(this.request, parent.request) - setPrototyeOf(this.response, parent.response) - setPrototyeOf(this.engines, parent.engines) - setPrototyeOf(this.settings, parent.settings) + setPrototypeOf(this.request, parent.request) + setPrototypeOf(this.response, parent.response) + setPrototypeOf(this.engines, parent.engines) + setPrototypeOf(this.settings, parent.settings) }); // setup locals @@ -207,7 +207,7 @@ app.use = function use(fn) { var fns = flatten(slice.call(arguments, offset)); if (fns.length === 0) { - throw new TypeError('app.use() requires middleware functions'); + throw new TypeError('app.use() requires a middleware function') } // setup router @@ -228,8 +228,8 @@ app.use = function use(fn) { router.use(path, function mounted_app(req, res, next) { var orig = req.app; fn.handle(req, res, function (err) { - setPrototyeOf(req, orig.request) - setPrototyeOf(res, orig.response) + setPrototypeOf(req, orig.request) + setPrototypeOf(res, orig.response) next(err); }); }); @@ -338,7 +338,7 @@ app.param = function param(name, fn) { * Assign `setting` to `val`, or return `setting`'s value. * * app.set('foo', 'bar'); - * app.get('foo'); + * app.set('foo'); * // => "bar" * * Mounted servers inherit their parent server's settings. diff --git a/nodejs/node_modules/express/lib/express.js b/nodejs/node_modules/express/lib/express.js index 187e4e2d7..485a8fc08 100644 --- a/nodejs/node_modules/express/lib/express.js +++ b/nodejs/node_modules/express/lib/express.js @@ -12,6 +12,7 @@ * Module dependencies. */ +var bodyParser = require('body-parser') var EventEmitter = require('events').EventEmitter; var mixin = require('merge-descriptors'); var proto = require('./application'); @@ -74,16 +75,16 @@ exports.Router = Router; * Expose middleware */ +exports.json = bodyParser.json exports.query = require('./middleware/query'); exports.static = require('serve-static'); +exports.urlencoded = bodyParser.urlencoded /** * Replace removed middleware with an appropriate error message. */ -[ - 'json', - 'urlencoded', +;[ 'bodyParser', 'compress', 'cookieSession', diff --git a/nodejs/node_modules/express/lib/middleware/init.js b/nodejs/node_modules/express/lib/middleware/init.js index 328c4a863..dfd042747 100644 --- a/nodejs/node_modules/express/lib/middleware/init.js +++ b/nodejs/node_modules/express/lib/middleware/init.js @@ -13,7 +13,7 @@ * @private */ -var setPrototyeOf = require('setprototypeof') +var setPrototypeOf = require('setprototypeof') /** * Initialization middleware, exposing the @@ -32,8 +32,8 @@ exports.init = function(app){ res.req = req; req.next = next; - setPrototyeOf(req, app.request) - setPrototyeOf(res, app.response) + setPrototypeOf(req, app.request) + setPrototypeOf(res, app.response) res.locals = res.locals || Object.create(null); diff --git a/nodejs/node_modules/express/lib/middleware/query.js b/nodejs/node_modules/express/lib/middleware/query.js index 5f76f8458..7e9166947 100644 --- a/nodejs/node_modules/express/lib/middleware/query.js +++ b/nodejs/node_modules/express/lib/middleware/query.js @@ -12,6 +12,7 @@ * Module dependencies. */ +var merge = require('utils-merge') var parseUrl = require('parseurl'); var qs = require('qs'); @@ -22,7 +23,7 @@ var qs = require('qs'); */ module.exports = function query(options) { - var opts = Object.create(options || null); + var opts = merge({}, options) var queryparse = qs.parse; if (typeof options === 'function') { diff --git a/nodejs/node_modules/express/lib/request.js b/nodejs/node_modules/express/lib/request.js index 3432e6776..8bb86a9ac 100644 --- a/nodejs/node_modules/express/lib/request.js +++ b/nodejs/node_modules/express/lib/request.js @@ -315,8 +315,12 @@ defineGetter(req, 'protocol', function protocol(){ // Note: X-Forwarded-Proto is normally only ever a // single value, but this is to be safe. - proto = this.get('X-Forwarded-Proto') || proto; - return proto.split(/\s*,\s*/)[0]; + var header = this.get('X-Forwarded-Proto') || proto + var index = header.indexOf(',') + + return index !== -1 + ? header.substring(0, index).trim() + : header.trim() }); /** diff --git a/nodejs/node_modules/express/lib/response.js b/nodejs/node_modules/express/lib/response.js index 6aefe1b17..9c1796d37 100644 --- a/nodejs/node_modules/express/lib/response.js +++ b/nodejs/node_modules/express/lib/response.js @@ -12,6 +12,7 @@ * @private */ +var Buffer = require('safe-buffer').Buffer var contentDisposition = require('content-disposition'); var deprecate = require('depd')('express'); var encodeUrl = require('encodeurl'); @@ -95,7 +96,7 @@ res.links = function(links){ * * Examples: * - * res.send(new Buffer('wahoo')); + * res.send(Buffer.from('wahoo')); * res.send({ some: 'json' }); * res.send('

some html

'); * @@ -106,7 +107,6 @@ res.links = function(links){ res.send = function send(body) { var chunk = body; var encoding; - var len; var req = this.req; var type; @@ -171,23 +171,33 @@ res.send = function send(body) { } } + // determine if ETag should be generated + var etagFn = app.get('etag fn') + var generateETag = !this.get('ETag') && typeof etagFn === 'function' + // populate Content-Length + var len if (chunk !== undefined) { - if (!Buffer.isBuffer(chunk)) { - // convert chunk to Buffer; saves later double conversions - chunk = new Buffer(chunk, encoding); + if (Buffer.isBuffer(chunk)) { + // get length of Buffer + len = chunk.length + } else if (!generateETag && chunk.length < 1000) { + // just calculate length when no ETag + small chunk + len = Buffer.byteLength(chunk, encoding) + } else { + // convert chunk to Buffer and calculate + chunk = Buffer.from(chunk, encoding) encoding = undefined; + len = chunk.length } - len = chunk.length; this.set('Content-Length', len); } // populate ETag var etag; - var generateETag = len !== undefined && app.get('etag fn'); - if (typeof generateETag === 'function' && !this.get('ETag')) { - if ((etag = generateETag(chunk, encoding))) { + if (generateETag && len !== undefined) { + if ((etag = etagFn(chunk, encoding))) { this.set('ETag', etag); } } @@ -244,9 +254,10 @@ res.json = function json(obj) { // settings var app = this.app; + var escape = app.get('json escape') var replacer = app.get('json replacer'); var spaces = app.get('json spaces'); - var body = stringify(val, replacer, spaces); + var body = stringify(val, replacer, spaces, escape) // content-type if (!this.get('Content-Type')) { @@ -286,9 +297,10 @@ res.jsonp = function jsonp(obj) { // settings var app = this.app; + var escape = app.get('json escape') var replacer = app.get('json replacer'); var spaces = app.get('json spaces'); - var body = stringify(val, replacer, spaces); + var body = stringify(val, replacer, spaces, escape) var callback = this.req.query[app.get('jsonp callback name')]; // content-type @@ -304,7 +316,6 @@ res.jsonp = function jsonp(obj) { // jsonp if (typeof callback === 'string' && callback.length !== 0) { - this.charset = 'utf-8'; this.set('X-Content-Type-Options', 'nosniff'); this.set('Content-Type', 'text/javascript'); @@ -506,19 +517,29 @@ res.sendfile = deprecate.function(res.sendfile, * when the data transfer is complete, or when an error has * ocurred. Be sure to check `res.headersSent` if you plan to respond. * - * This method uses `res.sendfile()`. + * Optionally providing an `options` object to use with `res.sendFile()`. + * This function will set the `Content-Disposition` header, overriding + * any `Content-Disposition` header passed as header options in order + * to set the attachment and filename. + * + * This method uses `res.sendFile()`. * * @public */ -res.download = function download(path, filename, callback) { +res.download = function download (path, filename, options, callback) { var done = callback; var name = filename; + var opts = options || null - // support function as second arg + // support function as second or third arg if (typeof filename === 'function') { done = filename; name = null; + opts = null + } else if (typeof options === 'function') { + done = options + opts = null } // set Content-Disposition when file is sent @@ -526,10 +547,26 @@ res.download = function download(path, filename, callback) { 'Content-Disposition': contentDisposition(name || path) }; + // merge user-provided headers + if (opts && opts.headers) { + var keys = Object.keys(opts.headers) + for (var i = 0; i < keys.length; i++) { + var key = keys[i] + if (key.toLowerCase() !== 'content-disposition') { + headers[key] = opts.headers[key] + } + } + } + + // merge user-provided options + opts = Object.create(opts) + opts.headers = headers + // Resolve the full path for sendFile var fullPath = resolve(path); - return this.sendFile(fullPath, { headers: headers }, done); + // send file + return this.sendFile(fullPath, opts, done) }; /** @@ -717,9 +754,14 @@ res.header = function header(field, val) { : String(val); // add charset to content-type - if (field.toLowerCase() === 'content-type' && !charsetRegExp.test(value)) { - var charset = mime.charsets.lookup(value.split(';')[0]); - if (charset) value += '; charset=' + charset.toLowerCase(); + if (field.toLowerCase() === 'content-type') { + if (Array.isArray(value)) { + throw new TypeError('Content-Type cannot be set to an Array'); + } + if (!charsetRegExp.test(value)) { + var charset = mime.charsets.lookup(value.split(';')[0]); + if (charset) value += '; charset=' + charset.toLowerCase(); + } } this.setHeader(field, value); @@ -777,7 +819,7 @@ res.clearCookie = function clearCookie(name, options) { * * @param {String} name * @param {String|Object} value - * @param {Options} options + * @param {Object} [options] * @return {ServerResponse} for chaining * @public */ @@ -1058,14 +1100,38 @@ function sendfile(res, file, options, callback) { } /** - * Stringify JSON, like JSON.stringify, but v8 optimized. + * Stringify JSON, like JSON.stringify, but v8 optimized, with the + * ability to escape characters that can trigger HTML sniffing. + * + * @param {*} value + * @param {function} replaces + * @param {number} spaces + * @param {boolean} escape + * @returns {string} * @private */ -function stringify(value, replacer, spaces) { +function stringify (value, replacer, spaces, escape) { // v8 checks arguments.length for optimizing simple call // https://bugs.chromium.org/p/v8/issues/detail?id=4730 - return replacer || spaces + var json = replacer || spaces ? JSON.stringify(value, replacer, spaces) : JSON.stringify(value); + + if (escape) { + json = json.replace(/[<>&]/g, function (c) { + switch (c.charCodeAt(0)) { + case 0x3c: + return '\\u003c' + case 0x3e: + return '\\u003e' + case 0x26: + return '\\u0026' + default: + return c + } + }) + } + + return json } diff --git a/nodejs/node_modules/express/lib/router/index.js b/nodejs/node_modules/express/lib/router/index.js index 51db4c28f..60727ed6d 100644 --- a/nodejs/node_modules/express/lib/router/index.js +++ b/nodejs/node_modules/express/lib/router/index.js @@ -448,14 +448,14 @@ proto.use = function use(fn) { var callbacks = flatten(slice.call(arguments, offset)); if (callbacks.length === 0) { - throw new TypeError('Router.use() requires middleware functions'); + throw new TypeError('Router.use() requires a middleware function') } for (var i = 0; i < callbacks.length; i++) { var fn = callbacks[i]; if (typeof fn !== 'function') { - throw new TypeError('Router.use() requires middleware function but got a ' + gettype(fn)); + throw new TypeError('Router.use() requires a middleware function but got a ' + gettype(fn)) } // add the middleware diff --git a/nodejs/node_modules/express/lib/router/route.js b/nodejs/node_modules/express/lib/router/route.js index ea82ed29d..178df0d51 100644 --- a/nodejs/node_modules/express/lib/router/route.js +++ b/nodejs/node_modules/express/lib/router/route.js @@ -175,7 +175,7 @@ Route.prototype.all = function all() { if (typeof handle !== 'function') { var type = toString.call(handle); - var msg = 'Route.all() requires callback functions but got a ' + type; + var msg = 'Route.all() requires a callback function but got a ' + type throw new TypeError(msg); } @@ -198,7 +198,7 @@ methods.forEach(function(method){ if (typeof handle !== 'function') { var type = toString.call(handle); - var msg = 'Route.' + method + '() requires callback functions but got a ' + type; + var msg = 'Route.' + method + '() requires a callback function but got a ' + type throw new Error(msg); } diff --git a/nodejs/node_modules/express/lib/utils.js b/nodejs/node_modules/express/lib/utils.js index f418c5807..bd81ac7f6 100644 --- a/nodejs/node_modules/express/lib/utils.js +++ b/nodejs/node_modules/express/lib/utils.js @@ -12,12 +12,12 @@ * @api private */ +var Buffer = require('safe-buffer').Buffer var contentDisposition = require('content-disposition'); var contentType = require('content-type'); var deprecate = require('depd')('express'); var flatten = require('array-flatten'); var mime = require('send').mime; -var basename = require('path').basename; var etag = require('etag'); var proxyaddr = require('proxy-addr'); var qs = require('qs'); @@ -32,13 +32,7 @@ var querystring = require('querystring'); * @api private */ -exports.etag = function (body, encoding) { - var buf = !Buffer.isBuffer(body) - ? new Buffer(body, encoding) - : body; - - return etag(buf, {weak: false}); -}; +exports.etag = createETagGenerator({ weak: false }) /** * Return weak ETag for `body`. @@ -49,13 +43,7 @@ exports.etag = function (body, encoding) { * @api private */ -exports.wetag = function wetag(body, encoding){ - var buf = !Buffer.isBuffer(body) - ? new Buffer(body, encoding) - : body; - - return etag(buf, {weak: true}); -}; +exports.wetag = createETagGenerator({ weak: true }) /** * Check if `path` looks absolute. @@ -274,6 +262,25 @@ exports.setCharset = function setCharset(type, charset) { return contentType.format(parsed); }; +/** + * Create an ETag generator function, generating ETags with + * the given options. + * + * @param {object} options + * @return {function} + * @private + */ + +function createETagGenerator (options) { + return function generateETag (body, encoding) { + var buf = !Buffer.isBuffer(body) + ? Buffer.from(body, encoding) + : body + + return etag(buf, options) + } +} + /** * Parse an extended query string with qs. * diff --git a/nodejs/node_modules/express/lib/view.js b/nodejs/node_modules/express/lib/view.js index 1728725d2..cf101caea 100644 --- a/nodejs/node_modules/express/lib/view.js +++ b/nodejs/node_modules/express/lib/view.js @@ -16,7 +16,6 @@ var debug = require('debug')('express:view'); var path = require('path'); var fs = require('fs'); -var utils = require('./utils'); /** * Module variables. @@ -77,7 +76,15 @@ function View(name, options) { // load engine var mod = this.ext.substr(1) debug('require "%s"', mod) - opts.engines[this.ext] = require(mod).__express + + // default engine export + var fn = require(mod).__express + + if (typeof fn !== 'function') { + throw new Error('Module "' + mod + '" does not provide a view engine.') + } + + opts.engines[this.ext] = fn } // store loaded engine diff --git a/nodejs/node_modules/express/node_modules/debug/.coveralls.yml b/nodejs/node_modules/express/node_modules/debug/.coveralls.yml deleted file mode 100644 index 20a706858..000000000 --- a/nodejs/node_modules/express/node_modules/debug/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -repo_token: SIAeZjKYlHK74rbcFvNHMUzjRiMpflxve diff --git a/nodejs/node_modules/express/node_modules/debug/.eslintrc b/nodejs/node_modules/express/node_modules/debug/.eslintrc deleted file mode 100644 index 8a37ae2c2..000000000 --- a/nodejs/node_modules/express/node_modules/debug/.eslintrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "env": { - "browser": true, - "node": true - }, - "rules": { - "no-console": 0, - "no-empty": [1, { "allowEmptyCatch": true }] - }, - "extends": "eslint:recommended" -} diff --git a/nodejs/node_modules/express/node_modules/debug/.npmignore b/nodejs/node_modules/express/node_modules/debug/.npmignore deleted file mode 100644 index db2fbb9db..000000000 --- a/nodejs/node_modules/express/node_modules/debug/.npmignore +++ /dev/null @@ -1,8 +0,0 @@ -support -test -examples -example -*.sock -dist -yarn.lock -coverage diff --git a/nodejs/node_modules/express/node_modules/debug/.travis.yml b/nodejs/node_modules/express/node_modules/debug/.travis.yml deleted file mode 100644 index 6c6090c3b..000000000 --- a/nodejs/node_modules/express/node_modules/debug/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ - -language: node_js -node_js: - - "6" - - "5" - - "4" - -install: - - make node_modules - -script: - - make lint - - make test - - make coveralls diff --git a/nodejs/node_modules/express/node_modules/debug/CHANGELOG.md b/nodejs/node_modules/express/node_modules/debug/CHANGELOG.md deleted file mode 100644 index 99abf97fe..000000000 --- a/nodejs/node_modules/express/node_modules/debug/CHANGELOG.md +++ /dev/null @@ -1,316 +0,0 @@ -2.6.1 / 2017-02-10 -================== - - * Fix: Module's `export default` syntax fix for IE8 `Expected identifier` error - * Fix: Whitelist DEBUG_FD for values 1 and 2 only (#415, @pi0) - * Fix: IE8 "Expected identifier" error (#414, @vgoma) - * Fix: Namespaces would not disable once enabled (#409, @musikov) - -2.6.0 / 2016-12-28 -================== - - * Fix: added better null pointer checks for browser useColors (@thebigredgeek) - * Improvement: removed explicit `window.debug` export (#404, @tootallnate) - * Improvement: deprecated `DEBUG_FD` environment variable (#405, @tootallnate) - -2.5.2 / 2016-12-25 -================== - - * Fix: reference error on window within webworkers (#393, @KlausTrainer) - * Docs: fixed README typo (#391, @lurch) - * Docs: added notice about v3 api discussion (@thebigredgeek) - -2.5.1 / 2016-12-20 -================== - - * Fix: babel-core compatibility - -2.5.0 / 2016-12-20 -================== - - * Fix: wrong reference in bower file (@thebigredgeek) - * Fix: webworker compatibility (@thebigredgeek) - * Fix: output formatting issue (#388, @kribblo) - * Fix: babel-loader compatibility (#383, @escwald) - * Misc: removed built asset from repo and publications (@thebigredgeek) - * Misc: moved source files to /src (#378, @yamikuronue) - * Test: added karma integration and replaced babel with browserify for browser tests (#378, @yamikuronue) - * Test: coveralls integration (#378, @yamikuronue) - * Docs: simplified language in the opening paragraph (#373, @yamikuronue) - -2.4.5 / 2016-12-17 -================== - - * Fix: `navigator` undefined in Rhino (#376, @jochenberger) - * Fix: custom log function (#379, @hsiliev) - * Improvement: bit of cleanup + linting fixes (@thebigredgeek) - * Improvement: rm non-maintainted `dist/` dir (#375, @freewil) - * Docs: simplified language in the opening paragraph. (#373, @yamikuronue) - -2.4.4 / 2016-12-14 -================== - - * Fix: work around debug being loaded in preload scripts for electron (#368, @paulcbetts) - -2.4.3 / 2016-12-14 -================== - - * Fix: navigation.userAgent error for react native (#364, @escwald) - -2.4.2 / 2016-12-14 -================== - - * Fix: browser colors (#367, @tootallnate) - * Misc: travis ci integration (@thebigredgeek) - * Misc: added linting and testing boilerplate with sanity check (@thebigredgeek) - -2.4.1 / 2016-12-13 -================== - - * Fix: typo that broke the package (#356) - -2.4.0 / 2016-12-13 -================== - - * Fix: bower.json references unbuilt src entry point (#342, @justmatt) - * Fix: revert "handle regex special characters" (@tootallnate) - * Feature: configurable util.inspect()`options for NodeJS (#327, @tootallnate) - * Feature: %O`(big O) pretty-prints objects (#322, @tootallnate) - * Improvement: allow colors in workers (#335, @botverse) - * Improvement: use same color for same namespace. (#338, @lchenay) - -2.3.3 / 2016-11-09 -================== - - * Fix: Catch `JSON.stringify()` errors (#195, Jovan Alleyne) - * Fix: Returning `localStorage` saved values (#331, Levi Thomason) - * Improvement: Don't create an empty object when no `process` (Nathan Rajlich) - -2.3.2 / 2016-11-09 -================== - - * Fix: be super-safe in index.js as well (@TooTallNate) - * Fix: should check whether process exists (Tom Newby) - -2.3.1 / 2016-11-09 -================== - - * Fix: Added electron compatibility (#324, @paulcbetts) - * Improvement: Added performance optimizations (@tootallnate) - * Readme: Corrected PowerShell environment variable example (#252, @gimre) - * Misc: Removed yarn lock file from source control (#321, @fengmk2) - -2.3.0 / 2016-11-07 -================== - - * Fix: Consistent placement of ms diff at end of output (#215, @gorangajic) - * Fix: Escaping of regex special characters in namespace strings (#250, @zacronos) - * Fix: Fixed bug causing crash on react-native (#282, @vkarpov15) - * Feature: Enabled ES6+ compatible import via default export (#212 @bucaran) - * Feature: Added %O formatter to reflect Chrome's console.log capability (#279, @oncletom) - * Package: Update "ms" to 0.7.2 (#315, @DevSide) - * Package: removed superfluous version property from bower.json (#207 @kkirsche) - * Readme: fix USE_COLORS to DEBUG_COLORS - * Readme: Doc fixes for format string sugar (#269, @mlucool) - * Readme: Updated docs for DEBUG_FD and DEBUG_COLORS environment variables (#232, @mattlyons0) - * Readme: doc fixes for PowerShell (#271 #243, @exoticknight @unreadable) - * Readme: better docs for browser support (#224, @matthewmueller) - * Tooling: Added yarn integration for development (#317, @thebigredgeek) - * Misc: Renamed History.md to CHANGELOG.md (@thebigredgeek) - * Misc: Added license file (#226 #274, @CantemoInternal @sdaitzman) - * Misc: Updated contributors (@thebigredgeek) - -2.2.0 / 2015-05-09 -================== - - * package: update "ms" to v0.7.1 (#202, @dougwilson) - * README: add logging to file example (#193, @DanielOchoa) - * README: fixed a typo (#191, @amir-s) - * browser: expose `storage` (#190, @stephenmathieson) - * Makefile: add a `distclean` target (#189, @stephenmathieson) - -2.1.3 / 2015-03-13 -================== - - * Updated stdout/stderr example (#186) - * Updated example/stdout.js to match debug current behaviour - * Renamed example/stderr.js to stdout.js - * Update Readme.md (#184) - * replace high intensity foreground color for bold (#182, #183) - -2.1.2 / 2015-03-01 -================== - - * dist: recompile - * update "ms" to v0.7.0 - * package: update "browserify" to v9.0.3 - * component: fix "ms.js" repo location - * changed bower package name - * updated documentation about using debug in a browser - * fix: security error on safari (#167, #168, @yields) - -2.1.1 / 2014-12-29 -================== - - * browser: use `typeof` to check for `console` existence - * browser: check for `console.log` truthiness (fix IE 8/9) - * browser: add support for Chrome apps - * Readme: added Windows usage remarks - * Add `bower.json` to properly support bower install - -2.1.0 / 2014-10-15 -================== - - * node: implement `DEBUG_FD` env variable support - * package: update "browserify" to v6.1.0 - * package: add "license" field to package.json (#135, @panuhorsmalahti) - -2.0.0 / 2014-09-01 -================== - - * package: update "browserify" to v5.11.0 - * node: use stderr rather than stdout for logging (#29, @stephenmathieson) - -1.0.4 / 2014-07-15 -================== - - * dist: recompile - * example: remove `console.info()` log usage - * example: add "Content-Type" UTF-8 header to browser example - * browser: place %c marker after the space character - * browser: reset the "content" color via `color: inherit` - * browser: add colors support for Firefox >= v31 - * debug: prefer an instance `log()` function over the global one (#119) - * Readme: update documentation about styled console logs for FF v31 (#116, @wryk) - -1.0.3 / 2014-07-09 -================== - - * Add support for multiple wildcards in namespaces (#122, @seegno) - * browser: fix lint - -1.0.2 / 2014-06-10 -================== - - * browser: update color palette (#113, @gscottolson) - * common: make console logging function configurable (#108, @timoxley) - * node: fix %o colors on old node <= 0.8.x - * Makefile: find node path using shell/which (#109, @timoxley) - -1.0.1 / 2014-06-06 -================== - - * browser: use `removeItem()` to clear localStorage - * browser, node: don't set DEBUG if namespaces is undefined (#107, @leedm777) - * package: add "contributors" section - * node: fix comment typo - * README: list authors - -1.0.0 / 2014-06-04 -================== - - * make ms diff be global, not be scope - * debug: ignore empty strings in enable() - * node: make DEBUG_COLORS able to disable coloring - * *: export the `colors` array - * npmignore: don't publish the `dist` dir - * Makefile: refactor to use browserify - * package: add "browserify" as a dev dependency - * Readme: add Web Inspector Colors section - * node: reset terminal color for the debug content - * node: map "%o" to `util.inspect()` - * browser: map "%j" to `JSON.stringify()` - * debug: add custom "formatters" - * debug: use "ms" module for humanizing the diff - * Readme: add "bash" syntax highlighting - * browser: add Firebug color support - * browser: add colors for WebKit browsers - * node: apply log to `console` - * rewrite: abstract common logic for Node & browsers - * add .jshintrc file - -0.8.1 / 2014-04-14 -================== - - * package: re-add the "component" section - -0.8.0 / 2014-03-30 -================== - - * add `enable()` method for nodejs. Closes #27 - * change from stderr to stdout - * remove unnecessary index.js file - -0.7.4 / 2013-11-13 -================== - - * remove "browserify" key from package.json (fixes something in browserify) - -0.7.3 / 2013-10-30 -================== - - * fix: catch localStorage security error when cookies are blocked (Chrome) - * add debug(err) support. Closes #46 - * add .browser prop to package.json. Closes #42 - -0.7.2 / 2013-02-06 -================== - - * fix package.json - * fix: Mobile Safari (private mode) is broken with debug - * fix: Use unicode to send escape character to shell instead of octal to work with strict mode javascript - -0.7.1 / 2013-02-05 -================== - - * add repository URL to package.json - * add DEBUG_COLORED to force colored output - * add browserify support - * fix component. Closes #24 - -0.7.0 / 2012-05-04 -================== - - * Added .component to package.json - * Added debug.component.js build - -0.6.0 / 2012-03-16 -================== - - * Added support for "-" prefix in DEBUG [Vinay Pulim] - * Added `.enabled` flag to the node version [TooTallNate] - -0.5.0 / 2012-02-02 -================== - - * Added: humanize diffs. Closes #8 - * Added `debug.disable()` to the CS variant - * Removed padding. Closes #10 - * Fixed: persist client-side variant again. Closes #9 - -0.4.0 / 2012-02-01 -================== - - * Added browser variant support for older browsers [TooTallNate] - * Added `debug.enable('project:*')` to browser variant [TooTallNate] - * Added padding to diff (moved it to the right) - -0.3.0 / 2012-01-26 -================== - - * Added millisecond diff when isatty, otherwise UTC string - -0.2.0 / 2012-01-22 -================== - - * Added wildcard support - -0.1.0 / 2011-12-02 -================== - - * Added: remove colors unless stderr isatty [TooTallNate] - -0.0.1 / 2010-01-03 -================== - - * Initial release diff --git a/nodejs/node_modules/express/node_modules/debug/LICENSE b/nodejs/node_modules/express/node_modules/debug/LICENSE deleted file mode 100644 index 658c933d2..000000000 --- a/nodejs/node_modules/express/node_modules/debug/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -(The MIT License) - -Copyright (c) 2014 TJ Holowaychuk - -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/nodejs/node_modules/express/node_modules/debug/Makefile b/nodejs/node_modules/express/node_modules/debug/Makefile deleted file mode 100644 index 584da8bf9..000000000 --- a/nodejs/node_modules/express/node_modules/debug/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# get Makefile directory name: http://stackoverflow.com/a/5982798/376773 -THIS_MAKEFILE_PATH:=$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -THIS_DIR:=$(shell cd $(dir $(THIS_MAKEFILE_PATH));pwd) - -# BIN directory -BIN := $(THIS_DIR)/node_modules/.bin - -# Path -PATH := node_modules/.bin:$(PATH) -SHELL := /bin/bash - -# applications -NODE ?= $(shell which node) -YARN ?= $(shell which yarn) -PKG ?= $(if $(YARN),$(YARN),$(NODE) $(shell which npm)) -BROWSERIFY ?= $(NODE) $(BIN)/browserify - -.FORCE: - -install: node_modules - -node_modules: package.json - @NODE_ENV= $(PKG) install - @touch node_modules - -lint: .FORCE - eslint browser.js debug.js index.js node.js - -test-node: .FORCE - istanbul cover node_modules/mocha/bin/_mocha -- test/**.js - -test-browser: .FORCE - mkdir -p dist - - @$(BROWSERIFY) \ - --standalone debug \ - . > dist/debug.js - - karma start --single-run - rimraf dist - -test: .FORCE - concurrently \ - "make test-node" \ - "make test-browser" - -coveralls: - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js - -.PHONY: all install clean distclean diff --git a/nodejs/node_modules/express/node_modules/debug/README.md b/nodejs/node_modules/express/node_modules/debug/README.md deleted file mode 100644 index 2c57ddfa5..000000000 --- a/nodejs/node_modules/express/node_modules/debug/README.md +++ /dev/null @@ -1,238 +0,0 @@ -# debug -[![Build Status](https://travis-ci.org/visionmedia/debug.svg?branch=master)](https://travis-ci.org/visionmedia/debug) [![Coverage Status](https://coveralls.io/repos/github/visionmedia/debug/badge.svg?branch=master)](https://coveralls.io/github/visionmedia/debug?branch=master) - -A tiny node.js debugging utility modelled after node core's debugging technique. - -**Discussion around the V3 API is under way [here](https://github.com/visionmedia/debug/issues/370)** - -## Installation - -```bash -$ npm install debug -``` - -## Usage - -`debug` exposes a function; simply pass this function the name of your module, and it will return a decorated version of `console.error` for you to pass debug statements to. This will allow you to toggle the debug output for different parts of your module as well as the module as a whole. - -Example _app.js_: - -```js -var debug = require('debug')('http') - , http = require('http') - , name = 'My App'; - -// fake app - -debug('booting %s', name); - -http.createServer(function(req, res){ - debug(req.method + ' ' + req.url); - res.end('hello\n'); -}).listen(3000, function(){ - debug('listening'); -}); - -// fake worker of some kind - -require('./worker'); -``` - -Example _worker.js_: - -```js -var debug = require('debug')('worker'); - -setInterval(function(){ - debug('doing some work'); -}, 1000); -``` - - The __DEBUG__ environment variable is then used to enable these based on space or comma-delimited names. Here are some examples: - - ![debug http and worker](http://f.cl.ly/items/18471z1H402O24072r1J/Screenshot.png) - - ![debug worker](http://f.cl.ly/items/1X413v1a3M0d3C2c1E0i/Screenshot.png) - -#### Windows note - - On Windows the environment variable is set using the `set` command. - - ```cmd - set DEBUG=*,-not_this - ``` - - Note that PowerShell uses different syntax to set environment variables. - - ```cmd - $env:DEBUG = "*,-not_this" - ``` - -Then, run the program to be debugged as usual. - -## Millisecond diff - - When actively developing an application it can be useful to see when the time spent between one `debug()` call and the next. Suppose for example you invoke `debug()` before requesting a resource, and after as well, the "+NNNms" will show you how much time was spent between calls. - - ![](http://f.cl.ly/items/2i3h1d3t121M2Z1A3Q0N/Screenshot.png) - - When stdout is not a TTY, `Date#toUTCString()` is used, making it more useful for logging the debug information as shown below: - - ![](http://f.cl.ly/items/112H3i0e0o0P0a2Q2r11/Screenshot.png) - -## Conventions - - If you're using this in one or more of your libraries, you _should_ use the name of your library so that developers may toggle debugging as desired without guessing names. If you have more than one debuggers you _should_ prefix them with your library name and use ":" to separate features. For example "bodyParser" from Connect would then be "connect:bodyParser". - -## Wildcards - - The `*` character may be used as a wildcard. Suppose for example your library has debuggers named "connect:bodyParser", "connect:compress", "connect:session", instead of listing all three with `DEBUG=connect:bodyParser,connect:compress,connect:session`, you may simply do `DEBUG=connect:*`, or to run everything using this module simply use `DEBUG=*`. - - You can also exclude specific debuggers by prefixing them with a "-" character. For example, `DEBUG=*,-connect:*` would include all debuggers except those starting with "connect:". - -## Environment Variables - - When running through Node.js, you can set a few environment variables that will - change the behavior of the debug logging: - -| Name | Purpose | -|-----------|-------------------------------------------------| -| `DEBUG` | Enables/disabled specific debugging namespaces. | -| `DEBUG_COLORS`| Whether or not to use colors in the debug output. | -| `DEBUG_DEPTH` | Object inspection depth. | -| `DEBUG_SHOW_HIDDEN` | Shows hidden properties on inspected objects. | - - - __Note:__ The environment variables beginning with `DEBUG_` end up being - converted into an Options object that gets used with `%o`/`%O` formatters. - See the Node.js documentation for - [`util.inspect()`](https://nodejs.org/api/util.html#util_util_inspect_object_options) - for the complete list. - -## Formatters - - - Debug uses [printf-style](https://wikipedia.org/wiki/Printf_format_string) formatting. Below are the officially supported formatters: - -| Formatter | Representation | -|-----------|----------------| -| `%O` | Pretty-print an Object on multiple lines. | -| `%o` | Pretty-print an Object all on a single line. | -| `%s` | String. | -| `%d` | Number (both integer and float). | -| `%j` | JSON. Replaced with the string '[Circular]' if the argument contains circular references. | -| `%%` | Single percent sign ('%'). This does not consume an argument. | - -### Custom formatters - - You can add custom formatters by extending the `debug.formatters` object. For example, if you wanted to add support for rendering a Buffer as hex with `%h`, you could do something like: - -```js -const createDebug = require('debug') -createDebug.formatters.h = (v) => { - return v.toString('hex') -} - -// …elsewhere -const debug = createDebug('foo') -debug('this is hex: %h', new Buffer('hello world')) -// foo this is hex: 68656c6c6f20776f726c6421 +0ms -``` - -## Browser support - You can build a browser-ready script using [browserify](https://github.com/substack/node-browserify), - or just use the [browserify-as-a-service](https://wzrd.in/) [build](https://wzrd.in/standalone/debug@latest), - if you don't want to build it yourself. - - Debug's enable state is currently persisted by `localStorage`. - Consider the situation shown below where you have `worker:a` and `worker:b`, - and wish to debug both. You can enable this using `localStorage.debug`: - -```js -localStorage.debug = 'worker:*' -``` - -And then refresh the page. - -```js -a = debug('worker:a'); -b = debug('worker:b'); - -setInterval(function(){ - a('doing some work'); -}, 1000); - -setInterval(function(){ - b('doing some work'); -}, 1200); -``` - -#### Web Inspector Colors - - Colors are also enabled on "Web Inspectors" that understand the `%c` formatting - option. These are WebKit web inspectors, Firefox ([since version - 31](https://hacks.mozilla.org/2014/05/editable-box-model-multiple-selection-sublime-text-keys-much-more-firefox-developer-tools-episode-31/)) - and the Firebug plugin for Firefox (any version). - - Colored output looks something like: - - ![](https://cloud.githubusercontent.com/assets/71256/3139768/b98c5fd8-e8ef-11e3-862a-f7253b6f47c6.png) - - -## Output streams - - By default `debug` will log to stderr, however this can be configured per-namespace by overriding the `log` method: - -Example _stdout.js_: - -```js -var debug = require('debug'); -var error = debug('app:error'); - -// by default stderr is used -error('goes to stderr!'); - -var log = debug('app:log'); -// set this namespace to log via console.log -log.log = console.log.bind(console); // don't forget to bind to console! -log('goes to stdout'); -error('still goes to stderr!'); - -// set all output to go via console.info -// overrides all per-namespace log settings -debug.log = console.info.bind(console); -error('now goes to stdout via console.info'); -log('still goes to stdout, but via console.info now'); -``` - - -## Authors - - - TJ Holowaychuk - - Nathan Rajlich - - Andrew Rhyne - -## License - -(The MIT License) - -Copyright (c) 2014-2016 TJ Holowaychuk <tj@vision-media.ca> - -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/nodejs/node_modules/express/node_modules/debug/bower.json b/nodejs/node_modules/express/node_modules/debug/bower.json deleted file mode 100644 index 027804ce0..000000000 --- a/nodejs/node_modules/express/node_modules/debug/bower.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "visionmedia-debug", - "main": "./src/browser.js", - "homepage": "https://github.com/visionmedia/debug", - "authors": [ - "TJ Holowaychuk ", - "Nathan Rajlich (http://n8.io)", - "Andrew Rhyne " - ], - "description": "visionmedia-debug", - "moduleType": [ - "amd", - "es6", - "globals", - "node" - ], - "keywords": [ - "visionmedia", - "debug" - ], - "license": "MIT", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ] -} diff --git a/nodejs/node_modules/express/node_modules/debug/component.json b/nodejs/node_modules/express/node_modules/debug/component.json deleted file mode 100644 index 4861027d4..000000000 --- a/nodejs/node_modules/express/node_modules/debug/component.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "debug", - "repo": "visionmedia/debug", - "description": "small debugging utility", - "version": "2.6.1", - "keywords": [ - "debug", - "log", - "debugger" - ], - "main": "src/browser.js", - "scripts": [ - "src/browser.js", - "src/debug.js" - ], - "dependencies": { - "rauchg/ms.js": "0.7.1" - } -} diff --git a/nodejs/node_modules/express/node_modules/debug/karma.conf.js b/nodejs/node_modules/express/node_modules/debug/karma.conf.js deleted file mode 100644 index 103a82d15..000000000 --- a/nodejs/node_modules/express/node_modules/debug/karma.conf.js +++ /dev/null @@ -1,70 +0,0 @@ -// Karma configuration -// Generated on Fri Dec 16 2016 13:09:51 GMT+0000 (UTC) - -module.exports = function(config) { - config.set({ - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '', - - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['mocha', 'chai', 'sinon'], - - - // list of files / patterns to load in the browser - files: [ - 'dist/debug.js', - 'test/*spec.js' - ], - - - // list of files to exclude - exclude: [ - 'src/node.js' - ], - - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - }, - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress'], - - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: true, - - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['PhantomJS'], - - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: false, - - // Concurrency level - // how many browser should be started simultaneous - concurrency: Infinity - }) -} diff --git a/nodejs/node_modules/express/node_modules/debug/node.js b/nodejs/node_modules/express/node_modules/debug/node.js deleted file mode 100644 index 7fc36fe6d..000000000 --- a/nodejs/node_modules/express/node_modules/debug/node.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./src/node'); diff --git a/nodejs/node_modules/express/node_modules/debug/package.json b/nodejs/node_modules/express/node_modules/debug/package.json deleted file mode 100644 index 118ee5062..000000000 --- a/nodejs/node_modules/express/node_modules/debug/package.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "_args": [ - [ - { - "raw": "debug@2.6.1", - "scope": null, - "escapedName": "debug", - "name": "debug", - "rawSpec": "2.6.1", - "spec": "2.6.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" - ] - ], - "_from": "debug@2.6.1", - "_id": "debug@2.6.1", - "_inCache": true, - "_location": "/express/debug", - "_nodeVersion": "6.9.0", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/debug-2.6.1.tgz_1486753226738_0.07569954148493707" - }, - "_npmUser": { - "name": "thebigredgeek", - "email": "rhyneandrew@gmail.com" - }, - "_npmVersion": "4.0.3", - "_phantomChildren": {}, - "_requested": { - "raw": "debug@2.6.1", - "scope": null, - "escapedName": "debug", - "name": "debug", - "rawSpec": "2.6.1", - "spec": "2.6.1", - "type": "version" - }, - "_requiredBy": [ - "/express" - ], - "_resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz", - "_shasum": "79855090ba2c4e3115cc7d8769491d58f0491351", - "_shrinkwrap": null, - "_spec": "debug@2.6.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", - "author": { - "name": "TJ Holowaychuk", - "email": "tj@vision-media.ca" - }, - "browser": "./src/browser.js", - "bugs": { - "url": "https://github.com/visionmedia/debug/issues" - }, - "component": { - "scripts": { - "debug/index.js": "browser.js", - "debug/debug.js": "debug.js" - } - }, - "contributors": [ - { - "name": "Nathan Rajlich", - "email": "nathan@tootallnate.net", - "url": "http://n8.io" - }, - { - "name": "Andrew Rhyne", - "email": "rhyneandrew@gmail.com" - } - ], - "dependencies": { - "ms": "0.7.2" - }, - "description": "small debugging utility", - "devDependencies": { - "browserify": "9.0.3", - "chai": "^3.5.0", - "concurrently": "^3.1.0", - "coveralls": "^2.11.15", - "eslint": "^3.12.1", - "istanbul": "^0.4.5", - "karma": "^1.3.0", - "karma-chai": "^0.1.0", - "karma-mocha": "^1.3.0", - "karma-phantomjs-launcher": "^1.0.2", - "karma-sinon": "^1.0.5", - "mocha": "^3.2.0", - "mocha-lcov-reporter": "^1.2.0", - "rimraf": "^2.5.4", - "sinon": "^1.17.6", - "sinon-chai": "^2.8.0" - }, - "directories": {}, - "dist": { - "shasum": "79855090ba2c4e3115cc7d8769491d58f0491351", - "tarball": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz" - }, - "gitHead": "941653e3334e9e3e2cca87cad9bbf6c5cb245215", - "homepage": "https://github.com/visionmedia/debug#readme", - "keywords": [ - "debug", - "log", - "debugger" - ], - "license": "MIT", - "main": "./src/index.js", - "maintainers": [ - { - "name": "thebigredgeek", - "email": "rhyneandrew@gmail.com" - } - ], - "name": "debug", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", - "repository": { - "type": "git", - "url": "git://github.com/visionmedia/debug.git" - }, - "scripts": {}, - "version": "2.6.1" -} diff --git a/nodejs/node_modules/express/node_modules/debug/src/browser.js b/nodejs/node_modules/express/node_modules/debug/src/browser.js deleted file mode 100644 index 38d6391e3..000000000 --- a/nodejs/node_modules/express/node_modules/debug/src/browser.js +++ /dev/null @@ -1,182 +0,0 @@ -/** - * This is the web browser implementation of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = require('./debug'); -exports.log = log; -exports.formatArgs = formatArgs; -exports.save = save; -exports.load = load; -exports.useColors = useColors; -exports.storage = 'undefined' != typeof chrome - && 'undefined' != typeof chrome.storage - ? chrome.storage.local - : localstorage(); - -/** - * Colors. - */ - -exports.colors = [ - 'lightseagreen', - 'forestgreen', - 'goldenrod', - 'dodgerblue', - 'darkorchid', - 'crimson' -]; - -/** - * Currently only WebKit-based Web Inspectors, Firefox >= v31, - * and the Firebug extension (any Firefox version) are known - * to support "%c" CSS customizations. - * - * TODO: add a `localStorage` variable to explicitly enable/disable colors - */ - -function useColors() { - // NB: In an Electron preload script, document will be defined but not fully - // initialized. Since we know we're in Chrome, we'll just detect this case - // explicitly - if (typeof window !== 'undefined' && window && typeof window.process !== 'undefined' && window.process.type === 'renderer') { - return true; - } - - // is webkit? http://stackoverflow.com/a/16459606/376773 - // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632 - return (typeof document !== 'undefined' && document && 'WebkitAppearance' in document.documentElement.style) || - // is firebug? http://stackoverflow.com/a/398120/376773 - (typeof window !== 'undefined' && window && window.console && (console.firebug || (console.exception && console.table))) || - // is firefox >= v31? - // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages - (typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) || - // double check webkit in userAgent just in case we are in a worker - (typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/)); -} - -/** - * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default. - */ - -exports.formatters.j = function(v) { - try { - return JSON.stringify(v); - } catch (err) { - return '[UnexpectedJSONParseError]: ' + err.message; - } -}; - - -/** - * Colorize log arguments if enabled. - * - * @api public - */ - -function formatArgs(args) { - var useColors = this.useColors; - - args[0] = (useColors ? '%c' : '') - + this.namespace - + (useColors ? ' %c' : ' ') - + args[0] - + (useColors ? '%c ' : ' ') - + '+' + exports.humanize(this.diff); - - if (!useColors) return; - - var c = 'color: ' + this.color; - args.splice(1, 0, c, 'color: inherit') - - // the final "%c" is somewhat tricky, because there could be other - // arguments passed either before or after the %c, so we need to - // figure out the correct index to insert the CSS into - var index = 0; - var lastC = 0; - args[0].replace(/%[a-zA-Z%]/g, function(match) { - if ('%%' === match) return; - index++; - if ('%c' === match) { - // we only are interested in the *last* %c - // (the user may have provided their own) - lastC = index; - } - }); - - args.splice(lastC, 0, c); -} - -/** - * Invokes `console.log()` when available. - * No-op when `console.log` is not a "function". - * - * @api public - */ - -function log() { - // this hackery is required for IE8/9, where - // the `console.log` function doesn't have 'apply' - return 'object' === typeof console - && console.log - && Function.prototype.apply.call(console.log, console, arguments); -} - -/** - * Save `namespaces`. - * - * @param {String} namespaces - * @api private - */ - -function save(namespaces) { - try { - if (null == namespaces) { - exports.storage.removeItem('debug'); - } else { - exports.storage.debug = namespaces; - } - } catch(e) {} -} - -/** - * Load `namespaces`. - * - * @return {String} returns the previously persisted debug modes - * @api private - */ - -function load() { - try { - return exports.storage.debug; - } catch(e) {} - - // If debug isn't set in LS, and we're in Electron, try to load $DEBUG - if (typeof process !== 'undefined' && 'env' in process) { - return process.env.DEBUG; - } -} - -/** - * Enable namespaces listed in `localStorage.debug` initially. - */ - -exports.enable(load()); - -/** - * Localstorage attempts to return the localstorage. - * - * This is necessary because safari throws - * when a user disables cookies/localstorage - * and you attempt to access it. - * - * @return {LocalStorage} - * @api private - */ - -function localstorage() { - try { - return window.localStorage; - } catch (e) {} -} diff --git a/nodejs/node_modules/express/node_modules/debug/src/debug.js b/nodejs/node_modules/express/node_modules/debug/src/debug.js deleted file mode 100644 index d5d6d1670..000000000 --- a/nodejs/node_modules/express/node_modules/debug/src/debug.js +++ /dev/null @@ -1,202 +0,0 @@ - -/** - * This is the common logic for both the Node.js and web browser - * implementations of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = createDebug.debug = createDebug['default'] = createDebug; -exports.coerce = coerce; -exports.disable = disable; -exports.enable = enable; -exports.enabled = enabled; -exports.humanize = require('ms'); - -/** - * The currently active debug mode names, and names to skip. - */ - -exports.names = []; -exports.skips = []; - -/** - * Map of special "%n" handling functions, for the debug "format" argument. - * - * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N". - */ - -exports.formatters = {}; - -/** - * Previous log timestamp. - */ - -var prevTime; - -/** - * Select a color. - * @param {String} namespace - * @return {Number} - * @api private - */ - -function selectColor(namespace) { - var hash = 0, i; - - for (i in namespace) { - hash = ((hash << 5) - hash) + namespace.charCodeAt(i); - hash |= 0; // Convert to 32bit integer - } - - return exports.colors[Math.abs(hash) % exports.colors.length]; -} - -/** - * Create a debugger with the given `namespace`. - * - * @param {String} namespace - * @return {Function} - * @api public - */ - -function createDebug(namespace) { - - function debug() { - // disabled? - if (!debug.enabled) return; - - var self = debug; - - // set `diff` timestamp - var curr = +new Date(); - var ms = curr - (prevTime || curr); - self.diff = ms; - self.prev = prevTime; - self.curr = curr; - prevTime = curr; - - // turn the `arguments` into a proper Array - var args = new Array(arguments.length); - for (var i = 0; i < args.length; i++) { - args[i] = arguments[i]; - } - - args[0] = exports.coerce(args[0]); - - if ('string' !== typeof args[0]) { - // anything else let's inspect with %O - args.unshift('%O'); - } - - // apply any `formatters` transformations - var index = 0; - args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) { - // if we encounter an escaped % then don't increase the array index - if (match === '%%') return match; - index++; - var formatter = exports.formatters[format]; - if ('function' === typeof formatter) { - var val = args[index]; - match = formatter.call(self, val); - - // now we need to remove `args[index]` since it's inlined in the `format` - args.splice(index, 1); - index--; - } - return match; - }); - - // apply env-specific formatting (colors, etc.) - exports.formatArgs.call(self, args); - - var logFn = debug.log || exports.log || console.log.bind(console); - logFn.apply(self, args); - } - - debug.namespace = namespace; - debug.enabled = exports.enabled(namespace); - debug.useColors = exports.useColors(); - debug.color = selectColor(namespace); - - // env-specific initialization logic for debug instances - if ('function' === typeof exports.init) { - exports.init(debug); - } - - return debug; -} - -/** - * Enables a debug mode by namespaces. This can include modes - * separated by a colon and wildcards. - * - * @param {String} namespaces - * @api public - */ - -function enable(namespaces) { - exports.save(namespaces); - - exports.names = []; - exports.skips = []; - - var split = (namespaces || '').split(/[\s,]+/); - var len = split.length; - - for (var i = 0; i < len; i++) { - if (!split[i]) continue; // ignore empty strings - namespaces = split[i].replace(/\*/g, '.*?'); - if (namespaces[0] === '-') { - exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$')); - } else { - exports.names.push(new RegExp('^' + namespaces + '$')); - } - } -} - -/** - * Disable debug output. - * - * @api public - */ - -function disable() { - exports.enable(''); -} - -/** - * Returns true if the given mode name is enabled, false otherwise. - * - * @param {String} name - * @return {Boolean} - * @api public - */ - -function enabled(name) { - var i, len; - for (i = 0, len = exports.skips.length; i < len; i++) { - if (exports.skips[i].test(name)) { - return false; - } - } - for (i = 0, len = exports.names.length; i < len; i++) { - if (exports.names[i].test(name)) { - return true; - } - } - return false; -} - -/** - * Coerce `val`. - * - * @param {Mixed} val - * @return {Mixed} - * @api private - */ - -function coerce(val) { - if (val instanceof Error) return val.stack || val.message; - return val; -} diff --git a/nodejs/node_modules/express/node_modules/debug/src/index.js b/nodejs/node_modules/express/node_modules/debug/src/index.js deleted file mode 100644 index e12cf4d58..000000000 --- a/nodejs/node_modules/express/node_modules/debug/src/index.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Detect Electron renderer process, which is node, but we should - * treat as a browser. - */ - -if (typeof process !== 'undefined' && process.type === 'renderer') { - module.exports = require('./browser.js'); -} else { - module.exports = require('./node.js'); -} diff --git a/nodejs/node_modules/express/node_modules/debug/src/node.js b/nodejs/node_modules/express/node_modules/debug/src/node.js deleted file mode 100644 index 4fa564b0d..000000000 --- a/nodejs/node_modules/express/node_modules/debug/src/node.js +++ /dev/null @@ -1,241 +0,0 @@ -/** - * Module dependencies. - */ - -var tty = require('tty'); -var util = require('util'); - -/** - * This is the Node.js implementation of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = require('./debug'); -exports.init = init; -exports.log = log; -exports.formatArgs = formatArgs; -exports.save = save; -exports.load = load; -exports.useColors = useColors; - -/** - * Colors. - */ - -exports.colors = [6, 2, 3, 4, 5, 1]; - -/** - * Build up the default `inspectOpts` object from the environment variables. - * - * $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js - */ - -exports.inspectOpts = Object.keys(process.env).filter(function (key) { - return /^debug_/i.test(key); -}).reduce(function (obj, key) { - // camel-case - var prop = key - .substring(6) - .toLowerCase() - .replace(/_([a-z])/, function (_, k) { return k.toUpperCase() }); - - // coerce string value into JS value - var val = process.env[key]; - if (/^(yes|on|true|enabled)$/i.test(val)) val = true; - else if (/^(no|off|false|disabled)$/i.test(val)) val = false; - else if (val === 'null') val = null; - else val = Number(val); - - obj[prop] = val; - return obj; -}, {}); - -/** - * The file descriptor to write the `debug()` calls to. - * Set the `DEBUG_FD` env variable to override with another value. i.e.: - * - * $ DEBUG_FD=3 node script.js 3>debug.log - */ - -var fd = parseInt(process.env.DEBUG_FD, 10) || 2; - -if (1 !== fd && 2 !== fd) { - util.deprecate(function(){}, 'except for stderr(2) and stdout(1), any other usage of DEBUG_FD is deprecated. Override debug.log if you want to use a different log function (https://git.io/debug_fd)')() -} - -var stream = 1 === fd ? process.stdout : - 2 === fd ? process.stderr : - createWritableStdioStream(fd); - -/** - * Is stdout a TTY? Colored output is enabled when `true`. - */ - -function useColors() { - return 'colors' in exports.inspectOpts - ? Boolean(exports.inspectOpts.colors) - : tty.isatty(fd); -} - -/** - * Map %o to `util.inspect()`, all on a single line. - */ - -exports.formatters.o = function(v) { - this.inspectOpts.colors = this.useColors; - return util.inspect(v, this.inspectOpts) - .replace(/\s*\n\s*/g, ' '); -}; - -/** - * Map %o to `util.inspect()`, allowing multiple lines if needed. - */ - -exports.formatters.O = function(v) { - this.inspectOpts.colors = this.useColors; - return util.inspect(v, this.inspectOpts); -}; - -/** - * Adds ANSI color escape codes if enabled. - * - * @api public - */ - -function formatArgs(args) { - var name = this.namespace; - var useColors = this.useColors; - - if (useColors) { - var c = this.color; - var prefix = ' \u001b[3' + c + ';1m' + name + ' ' + '\u001b[0m'; - - args[0] = prefix + args[0].split('\n').join('\n' + prefix); - args.push('\u001b[3' + c + 'm+' + exports.humanize(this.diff) + '\u001b[0m'); - } else { - args[0] = new Date().toUTCString() - + ' ' + name + ' ' + args[0]; - } -} - -/** - * Invokes `util.format()` with the specified arguments and writes to `stream`. - */ - -function log() { - return stream.write(util.format.apply(util, arguments) + '\n'); -} - -/** - * Save `namespaces`. - * - * @param {String} namespaces - * @api private - */ - -function save(namespaces) { - if (null == namespaces) { - // If you set a process.env field to null or undefined, it gets cast to the - // string 'null' or 'undefined'. Just delete instead. - delete process.env.DEBUG; - } else { - process.env.DEBUG = namespaces; - } -} - -/** - * Load `namespaces`. - * - * @return {String} returns the previously persisted debug modes - * @api private - */ - -function load() { - return process.env.DEBUG; -} - -/** - * Copied from `node/src/node.js`. - * - * XXX: It's lame that node doesn't expose this API out-of-the-box. It also - * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame. - */ - -function createWritableStdioStream (fd) { - var stream; - var tty_wrap = process.binding('tty_wrap'); - - // Note stream._type is used for test-module-load-list.js - - switch (tty_wrap.guessHandleType(fd)) { - case 'TTY': - stream = new tty.WriteStream(fd); - stream._type = 'tty'; - - // Hack to have stream not keep the event loop alive. - // See https://github.com/joyent/node/issues/1726 - if (stream._handle && stream._handle.unref) { - stream._handle.unref(); - } - break; - - case 'FILE': - var fs = require('fs'); - stream = new fs.SyncWriteStream(fd, { autoClose: false }); - stream._type = 'fs'; - break; - - case 'PIPE': - case 'TCP': - var net = require('net'); - stream = new net.Socket({ - fd: fd, - readable: false, - writable: true - }); - - // FIXME Should probably have an option in net.Socket to create a - // stream from an existing fd which is writable only. But for now - // we'll just add this hack and set the `readable` member to false. - // Test: ./node test/fixtures/echo.js < /etc/passwd - stream.readable = false; - stream.read = null; - stream._type = 'pipe'; - - // FIXME Hack to have stream not keep the event loop alive. - // See https://github.com/joyent/node/issues/1726 - if (stream._handle && stream._handle.unref) { - stream._handle.unref(); - } - break; - - default: - // Probably an error on in uv_guess_handle() - throw new Error('Implement me. Unknown stream file type!'); - } - - // For supporting legacy API we put the FD here. - stream.fd = fd; - - stream._isStdio = true; - - return stream; -} - -/** - * Init logic for `debug` instances. - * - * Create a new `inspectOpts` object in case `useColors` is set - * differently for a particular `debug` instance. - */ - -function init (debug) { - debug.inspectOpts = util._extend({}, exports.inspectOpts); -} - -/** - * Enable namespaces listed in `process.env.DEBUG` initially. - */ - -exports.enable(load()); diff --git a/nodejs/node_modules/express/node_modules/ms/README.md b/nodejs/node_modules/express/node_modules/ms/README.md deleted file mode 100644 index 5b475707d..000000000 --- a/nodejs/node_modules/express/node_modules/ms/README.md +++ /dev/null @@ -1,52 +0,0 @@ -# ms - -[![Build Status](https://travis-ci.org/zeit/ms.svg?branch=master)](https://travis-ci.org/zeit/ms) -[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo) -[![Slack Channel](https://zeit-slackin.now.sh/badge.svg)](https://zeit.chat/) - -Use this package to easily convert various time formats to milliseconds. - -## Examples - -```js -ms('2 days') // 172800000 -ms('1d') // 86400000 -ms('10h') // 36000000 -ms('2.5 hrs') // 9000000 -ms('2h') // 7200000 -ms('1m') // 60000 -ms('5s') // 5000 -ms('1y') // 31557600000 -ms('100') // 100 -``` - -### Convert from milliseconds - -```js -ms(60000) // "1m" -ms(2 * 60000) // "2m" -ms(ms('10 hours')) // "10h" -``` - -### Time format written-out - -```js -ms(60000, { long: true }) // "1 minute" -ms(2 * 60000, { long: true }) // "2 minutes" -ms(ms('10 hours'), { long: true }) // "10 hours" -``` - -## Features - -- Works both in [node](https://nodejs.org) and in the browser. -- If a number is supplied to `ms`, a string with a unit is returned. -- If a string that contains the number is supplied, it returns it as a number (e.g.: it returns `100` for `'100'`). -- If you pass a string with a number and a valid unit, the number of equivalent ms is returned. - -## Caught a bug? - -1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device -2. Link the package to the global module directory: `npm link` -3. Within the module you want to test your local development instance of ms, just link it to the dependencies: `npm link ms`. Instead of the default one from npm, node will now use your clone of ms! - -As always, you can run the tests using: `npm test` diff --git a/nodejs/node_modules/express/node_modules/ms/index.js b/nodejs/node_modules/express/node_modules/ms/index.js deleted file mode 100644 index 824b37eba..000000000 --- a/nodejs/node_modules/express/node_modules/ms/index.js +++ /dev/null @@ -1,149 +0,0 @@ -/** - * Helpers. - */ - -var s = 1000 -var m = s * 60 -var h = m * 60 -var d = h * 24 -var y = d * 365.25 - -/** - * Parse or format the given `val`. - * - * Options: - * - * - `long` verbose formatting [false] - * - * @param {String|Number} val - * @param {Object} options - * @throws {Error} throw an error if val is not a non-empty string or a number - * @return {String|Number} - * @api public - */ - -module.exports = function (val, options) { - options = options || {} - var type = typeof val - if (type === 'string' && val.length > 0) { - return parse(val) - } else if (type === 'number' && isNaN(val) === false) { - return options.long ? - fmtLong(val) : - fmtShort(val) - } - throw new Error('val is not a non-empty string or a valid number. val=' + JSON.stringify(val)) -} - -/** - * Parse the given `str` and return milliseconds. - * - * @param {String} str - * @return {Number} - * @api private - */ - -function parse(str) { - str = String(str) - if (str.length > 10000) { - return - } - var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str) - if (!match) { - return - } - var n = parseFloat(match[1]) - var type = (match[2] || 'ms').toLowerCase() - switch (type) { - case 'years': - case 'year': - case 'yrs': - case 'yr': - case 'y': - return n * y - case 'days': - case 'day': - case 'd': - return n * d - case 'hours': - case 'hour': - case 'hrs': - case 'hr': - case 'h': - return n * h - case 'minutes': - case 'minute': - case 'mins': - case 'min': - case 'm': - return n * m - case 'seconds': - case 'second': - case 'secs': - case 'sec': - case 's': - return n * s - case 'milliseconds': - case 'millisecond': - case 'msecs': - case 'msec': - case 'ms': - return n - default: - return undefined - } -} - -/** - * Short format for `ms`. - * - * @param {Number} ms - * @return {String} - * @api private - */ - -function fmtShort(ms) { - if (ms >= d) { - return Math.round(ms / d) + 'd' - } - if (ms >= h) { - return Math.round(ms / h) + 'h' - } - if (ms >= m) { - return Math.round(ms / m) + 'm' - } - if (ms >= s) { - return Math.round(ms / s) + 's' - } - return ms + 'ms' -} - -/** - * Long format for `ms`. - * - * @param {Number} ms - * @return {String} - * @api private - */ - -function fmtLong(ms) { - return plural(ms, d, 'day') || - plural(ms, h, 'hour') || - plural(ms, m, 'minute') || - plural(ms, s, 'second') || - ms + ' ms' -} - -/** - * Pluralization helper. - */ - -function plural(ms, n, name) { - if (ms < n) { - return - } - if (ms < n * 1.5) { - return Math.floor(ms / n) + ' ' + name - } - return Math.ceil(ms / n) + ' ' + name + 's' -} diff --git a/nodejs/node_modules/express/node_modules/ms/package.json b/nodejs/node_modules/express/node_modules/ms/package.json deleted file mode 100644 index 53a474ec5..000000000 --- a/nodejs/node_modules/express/node_modules/ms/package.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "_args": [ - [ - { - "raw": "ms@0.7.2", - "scope": null, - "escapedName": "ms", - "name": "ms", - "rawSpec": "0.7.2", - "spec": "0.7.2", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express/node_modules/debug" - ] - ], - "_from": "ms@0.7.2", - "_id": "ms@0.7.2", - "_inCache": true, - "_location": "/express/ms", - "_nodeVersion": "6.8.0", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/ms-0.7.2.tgz_1477383407940_0.4743474116548896" - }, - "_npmUser": { - "name": "leo", - "email": "leo@zeit.co" - }, - "_npmVersion": "3.10.8", - "_phantomChildren": {}, - "_requested": { - "raw": "ms@0.7.2", - "scope": null, - "escapedName": "ms", - "name": "ms", - "rawSpec": "0.7.2", - "spec": "0.7.2", - "type": "version" - }, - "_requiredBy": [ - "/express/debug" - ], - "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "_shasum": "ae25cf2512b3885a1d95d7f037868d8431124765", - "_shrinkwrap": null, - "_spec": "ms@0.7.2", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express/node_modules/debug", - "bugs": { - "url": "https://github.com/zeit/ms/issues" - }, - "component": { - "scripts": { - "ms/index.js": "index.js" - } - }, - "dependencies": {}, - "description": "Tiny milisecond conversion utility", - "devDependencies": { - "expect.js": "^0.3.1", - "mocha": "^3.0.2", - "serve": "^1.4.0", - "xo": "^0.17.0" - }, - "directories": {}, - "dist": { - "shasum": "ae25cf2512b3885a1d95d7f037868d8431124765", - "tarball": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz" - }, - "files": [ - "index.js" - ], - "gitHead": "ac92a7e0790ba2622a74d9d60690ca0d2c070a45", - "homepage": "https://github.com/zeit/ms#readme", - "license": "MIT", - "main": "./index", - "maintainers": [ - { - "name": "leo", - "email": "leo@zeit.co" - }, - { - "name": "rauchg", - "email": "rauchg@gmail.com" - } - ], - "name": "ms", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", - "repository": { - "type": "git", - "url": "git+https://github.com/zeit/ms.git" - }, - "scripts": { - "test": "xo && mocha test/index.js", - "test-browser": "serve ./test" - }, - "version": "0.7.2", - "xo": { - "space": true, - "semicolon": false, - "envs": [ - "mocha" - ], - "rules": { - "complexity": 0 - } - } -} diff --git a/nodejs/node_modules/express/package.json b/nodejs/node_modules/express/package.json index 028b3033a..42cdffcaa 100644 --- a/nodejs/node_modules/express/package.json +++ b/nodejs/node_modules/express/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "express@^4.9.3", - "scope": null, - "escapedName": "express", - "name": "express", - "rawSpec": "^4.9.3", - "spec": ">=4.9.3 <5.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio" + "express@4.16.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "express@>=4.9.3 <5.0.0", - "_id": "express@4.15.2", - "_inCache": true, + "_from": "express@4.16.2", + "_id": "express@4.16.2", + "_inBundle": false, + "_integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=", "_location": "/express", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/express-4.15.2.tgz_1488807764132_0.2808149973861873" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "express@^4.9.3", - "scope": null, - "escapedName": "express", + "type": "version", + "registry": true, + "raw": "express@4.16.2", "name": "express", - "rawSpec": "^4.9.3", - "spec": ">=4.9.3 <5.0.0", - "type": "range" + "escapedName": "express", + "rawSpec": "4.16.2", + "saveSpec": null, + "fetchSpec": "4.16.2" }, "_requiredBy": [ "/webcast-osx-audio" ], - "_resolved": "https://registry.npmjs.org/express/-/express-4.15.2.tgz", - "_shasum": "af107fc148504457f2dca9a6f2571d7129b97b35", - "_shrinkwrap": null, - "_spec": "express@^4.9.3", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio", + "_resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz", + "_spec": "4.16.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" @@ -83,61 +65,58 @@ } ], "dependencies": { - "accepts": "~1.3.3", + "accepts": "~1.3.4", "array-flatten": "1.1.1", + "body-parser": "1.18.2", "content-disposition": "0.5.2", - "content-type": "~1.0.2", + "content-type": "~1.0.4", "cookie": "0.3.1", "cookie-signature": "1.0.6", - "debug": "2.6.1", - "depd": "~1.1.0", + "debug": "2.6.9", + "depd": "~1.1.1", "encodeurl": "~1.0.1", "escape-html": "~1.0.3", - "etag": "~1.8.0", - "finalhandler": "~1.0.0", - "fresh": "0.5.0", + "etag": "~1.8.1", + "finalhandler": "1.1.0", + "fresh": "0.5.2", "merge-descriptors": "1.0.1", "methods": "~1.1.2", "on-finished": "~2.3.0", - "parseurl": "~1.3.1", + "parseurl": "~1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "~1.1.3", - "qs": "6.4.0", + "proxy-addr": "~2.0.2", + "qs": "6.5.1", "range-parser": "~1.2.0", - "send": "0.15.1", - "serve-static": "1.12.1", - "setprototypeof": "1.0.3", + "safe-buffer": "5.1.1", + "send": "0.16.1", + "serve-static": "1.13.1", + "setprototypeof": "1.1.0", "statuses": "~1.3.1", - "type-is": "~1.6.14", - "utils-merge": "1.0.0", - "vary": "~1.1.0" + "type-is": "~1.6.15", + "utils-merge": "1.0.1", + "vary": "~1.1.2" }, "description": "Fast, unopinionated, minimalist web framework", "devDependencies": { "after": "0.8.2", - "body-parser": "1.17.1", "connect-redis": "~2.4.1", "cookie-parser": "~1.4.3", - "cookie-session": "~1.2.0", - "ejs": "2.5.6", - "express-session": "1.15.1", + "cookie-session": "1.3.2", + "ejs": "2.5.7", + "eslint": "2.13.1", + "express-session": "1.15.6", + "hbs": "4.0.1", "istanbul": "0.4.5", - "jade": "~1.11.0", "marked": "0.3.6", - "method-override": "2.3.7", - "mocha": "3.2.0", - "morgan": "1.8.1", + "method-override": "2.3.10", + "mocha": "3.5.3", + "morgan": "1.9.0", "multiparty": "4.1.3", "pbkdf2-password": "1.2.1", - "should": "11.2.0", + "should": "13.1.0", "supertest": "1.2.0", "vhost": "~3.0.2" }, - "directories": {}, - "dist": { - "shasum": "af107fc148504457f2dca9a6f2571d7129b97b35", - "tarball": "https://registry.npmjs.org/express/-/express-4.15.2.tgz" - }, "engines": { "node": ">= 0.10.0" }, @@ -148,7 +127,6 @@ "index.js", "lib/" ], - "gitHead": "d43b074f0b3b56a91f240e62798c932ba104b79a", "homepage": "http://expressjs.com/", "keywords": [ "express", @@ -162,36 +140,17 @@ "api" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "hacksparrow", - "email": "captain@hacksparrow.com" - }, - { - "name": "jasnell", - "email": "jasnell@gmail.com" - }, - { - "name": "mikeal", - "email": "mikeal.rogers@gmail.com" - } - ], "name": "express", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/expressjs/express.git" }, "scripts": { - "test": "mocha --require test/support/env --reporter spec --bail --check-leaks test/ test/acceptance/", - "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --require test/support/env --reporter spec --check-leaks test/ test/acceptance/", - "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --require test/support/env --reporter dot --check-leaks test/ test/acceptance/", - "test-tap": "mocha --require test/support/env --reporter tap --check-leaks test/ test/acceptance/" + "lint": "eslint .", + "test": "mocha --require test/support/env --reporter spec --bail --check-leaks --no-exit test/ test/acceptance/", + "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --require test/support/env --reporter spec --check-leaks --no-exit test/ test/acceptance/", + "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --require test/support/env --reporter dot --check-leaks --no-exit test/ test/acceptance/", + "test-tap": "mocha --require test/support/env --reporter tap --check-leaks --no-exit test/ test/acceptance/" }, - "version": "4.15.2" + "version": "4.16.2" } diff --git a/nodejs/node_modules/finalhandler/HISTORY.md b/nodejs/node_modules/finalhandler/HISTORY.md index 05e646ec3..4f7244d78 100644 --- a/nodejs/node_modules/finalhandler/HISTORY.md +++ b/nodejs/node_modules/finalhandler/HISTORY.md @@ -1,3 +1,31 @@ +1.1.0 / 2017-09-24 +================== + + * Use `res.headersSent` when available + +1.0.6 / 2017-09-22 +================== + + * deps: debug@2.6.9 + +1.0.5 / 2017-09-15 +================== + + * deps: parseurl@~1.3.2 + - perf: reduce overhead for full URLs + - perf: unroll the "fast-path" `RegExp` + +1.0.4 / 2017-08-03 +================== + + * deps: debug@2.6.8 + +1.0.3 / 2017-05-16 +================== + + * deps: debug@2.6.7 + - deps: ms@2.0.0 + 1.0.2 / 2017-04-22 ================== diff --git a/nodejs/node_modules/finalhandler/README.md b/nodejs/node_modules/finalhandler/README.md index 84c3d2af1..6756f0cd2 100644 --- a/nodejs/node_modules/finalhandler/README.md +++ b/nodejs/node_modules/finalhandler/README.md @@ -20,7 +20,9 @@ $ npm install finalhandler ## API -``` + + +```js var finalhandler = require('finalhandler') ``` diff --git a/nodejs/node_modules/finalhandler/index.js b/nodejs/node_modules/finalhandler/index.js index 87974ca03..42f0f7499 100644 --- a/nodejs/node_modules/finalhandler/index.js +++ b/nodejs/node_modules/finalhandler/index.js @@ -89,7 +89,7 @@ function finalhandler (req, res, options) { var status // ignore 404 on in-flight response - if (!err && res._header) { + if (!err && headersSent(res)) { debug('cannot 404 after headers sent') return } @@ -125,7 +125,7 @@ function finalhandler (req, res, options) { } // cannot actually respond - if (res._header) { + if (headersSent(res)) { debug('cannot %d after headers sent', status) req.socket.destroy() return @@ -227,6 +227,20 @@ function getResponseStatusCode (res) { return status } +/** + * Determine if the response headers have been sent. + * + * @param {object} res + * @returns {boolean} + * @private + */ + +function headersSent (res) { + return typeof res.headersSent !== 'boolean' + ? Boolean(res._header) + : res.headersSent +} + /** * Send response. * diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/.coveralls.yml b/nodejs/node_modules/finalhandler/node_modules/debug/.coveralls.yml deleted file mode 100644 index 20a706858..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -repo_token: SIAeZjKYlHK74rbcFvNHMUzjRiMpflxve diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/.eslintrc b/nodejs/node_modules/finalhandler/node_modules/debug/.eslintrc deleted file mode 100644 index 8a37ae2c2..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/.eslintrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "env": { - "browser": true, - "node": true - }, - "rules": { - "no-console": 0, - "no-empty": [1, { "allowEmptyCatch": true }] - }, - "extends": "eslint:recommended" -} diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/.npmignore b/nodejs/node_modules/finalhandler/node_modules/debug/.npmignore deleted file mode 100644 index 5f60eecc8..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/.npmignore +++ /dev/null @@ -1,9 +0,0 @@ -support -test -examples -example -*.sock -dist -yarn.lock -coverage -bower.json diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/.travis.yml b/nodejs/node_modules/finalhandler/node_modules/debug/.travis.yml deleted file mode 100644 index 6c6090c3b..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ - -language: node_js -node_js: - - "6" - - "5" - - "4" - -install: - - make node_modules - -script: - - make lint - - make test - - make coveralls diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/CHANGELOG.md b/nodejs/node_modules/finalhandler/node_modules/debug/CHANGELOG.md deleted file mode 100644 index 37a62926b..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/CHANGELOG.md +++ /dev/null @@ -1,337 +0,0 @@ - -2.6.4 / 2017-04-20 -================== - - * Fix: bug that would occure if process.env.DEBUG is a non-string value. (#444, @LucianBuzzo) - * Chore: ignore bower.json in npm installations. (#437, @joaovieira) - * Misc: update "ms" to v0.7.3 (@tootallnate) - -2.6.3 / 2017-03-13 -================== - - * Fix: Electron reference to `process.env.DEBUG` (#431, @paulcbetts) - * Docs: Changelog fix (@thebigredgeek) - -2.6.2 / 2017-03-10 -================== - - * Fix: DEBUG_MAX_ARRAY_LENGTH (#420, @slavaGanzin) - * Docs: Add backers and sponsors from Open Collective (#422, @piamancini) - * Docs: Add Slackin invite badge (@tootallnate) - -2.6.1 / 2017-02-10 -================== - - * Fix: Module's `export default` syntax fix for IE8 `Expected identifier` error - * Fix: Whitelist DEBUG_FD for values 1 and 2 only (#415, @pi0) - * Fix: IE8 "Expected identifier" error (#414, @vgoma) - * Fix: Namespaces would not disable once enabled (#409, @musikov) - -2.6.0 / 2016-12-28 -================== - - * Fix: added better null pointer checks for browser useColors (@thebigredgeek) - * Improvement: removed explicit `window.debug` export (#404, @tootallnate) - * Improvement: deprecated `DEBUG_FD` environment variable (#405, @tootallnate) - -2.5.2 / 2016-12-25 -================== - - * Fix: reference error on window within webworkers (#393, @KlausTrainer) - * Docs: fixed README typo (#391, @lurch) - * Docs: added notice about v3 api discussion (@thebigredgeek) - -2.5.1 / 2016-12-20 -================== - - * Fix: babel-core compatibility - -2.5.0 / 2016-12-20 -================== - - * Fix: wrong reference in bower file (@thebigredgeek) - * Fix: webworker compatibility (@thebigredgeek) - * Fix: output formatting issue (#388, @kribblo) - * Fix: babel-loader compatibility (#383, @escwald) - * Misc: removed built asset from repo and publications (@thebigredgeek) - * Misc: moved source files to /src (#378, @yamikuronue) - * Test: added karma integration and replaced babel with browserify for browser tests (#378, @yamikuronue) - * Test: coveralls integration (#378, @yamikuronue) - * Docs: simplified language in the opening paragraph (#373, @yamikuronue) - -2.4.5 / 2016-12-17 -================== - - * Fix: `navigator` undefined in Rhino (#376, @jochenberger) - * Fix: custom log function (#379, @hsiliev) - * Improvement: bit of cleanup + linting fixes (@thebigredgeek) - * Improvement: rm non-maintainted `dist/` dir (#375, @freewil) - * Docs: simplified language in the opening paragraph. (#373, @yamikuronue) - -2.4.4 / 2016-12-14 -================== - - * Fix: work around debug being loaded in preload scripts for electron (#368, @paulcbetts) - -2.4.3 / 2016-12-14 -================== - - * Fix: navigation.userAgent error for react native (#364, @escwald) - -2.4.2 / 2016-12-14 -================== - - * Fix: browser colors (#367, @tootallnate) - * Misc: travis ci integration (@thebigredgeek) - * Misc: added linting and testing boilerplate with sanity check (@thebigredgeek) - -2.4.1 / 2016-12-13 -================== - - * Fix: typo that broke the package (#356) - -2.4.0 / 2016-12-13 -================== - - * Fix: bower.json references unbuilt src entry point (#342, @justmatt) - * Fix: revert "handle regex special characters" (@tootallnate) - * Feature: configurable util.inspect()`options for NodeJS (#327, @tootallnate) - * Feature: %O`(big O) pretty-prints objects (#322, @tootallnate) - * Improvement: allow colors in workers (#335, @botverse) - * Improvement: use same color for same namespace. (#338, @lchenay) - -2.3.3 / 2016-11-09 -================== - - * Fix: Catch `JSON.stringify()` errors (#195, Jovan Alleyne) - * Fix: Returning `localStorage` saved values (#331, Levi Thomason) - * Improvement: Don't create an empty object when no `process` (Nathan Rajlich) - -2.3.2 / 2016-11-09 -================== - - * Fix: be super-safe in index.js as well (@TooTallNate) - * Fix: should check whether process exists (Tom Newby) - -2.3.1 / 2016-11-09 -================== - - * Fix: Added electron compatibility (#324, @paulcbetts) - * Improvement: Added performance optimizations (@tootallnate) - * Readme: Corrected PowerShell environment variable example (#252, @gimre) - * Misc: Removed yarn lock file from source control (#321, @fengmk2) - -2.3.0 / 2016-11-07 -================== - - * Fix: Consistent placement of ms diff at end of output (#215, @gorangajic) - * Fix: Escaping of regex special characters in namespace strings (#250, @zacronos) - * Fix: Fixed bug causing crash on react-native (#282, @vkarpov15) - * Feature: Enabled ES6+ compatible import via default export (#212 @bucaran) - * Feature: Added %O formatter to reflect Chrome's console.log capability (#279, @oncletom) - * Package: Update "ms" to 0.7.2 (#315, @DevSide) - * Package: removed superfluous version property from bower.json (#207 @kkirsche) - * Readme: fix USE_COLORS to DEBUG_COLORS - * Readme: Doc fixes for format string sugar (#269, @mlucool) - * Readme: Updated docs for DEBUG_FD and DEBUG_COLORS environment variables (#232, @mattlyons0) - * Readme: doc fixes for PowerShell (#271 #243, @exoticknight @unreadable) - * Readme: better docs for browser support (#224, @matthewmueller) - * Tooling: Added yarn integration for development (#317, @thebigredgeek) - * Misc: Renamed History.md to CHANGELOG.md (@thebigredgeek) - * Misc: Added license file (#226 #274, @CantemoInternal @sdaitzman) - * Misc: Updated contributors (@thebigredgeek) - -2.2.0 / 2015-05-09 -================== - - * package: update "ms" to v0.7.1 (#202, @dougwilson) - * README: add logging to file example (#193, @DanielOchoa) - * README: fixed a typo (#191, @amir-s) - * browser: expose `storage` (#190, @stephenmathieson) - * Makefile: add a `distclean` target (#189, @stephenmathieson) - -2.1.3 / 2015-03-13 -================== - - * Updated stdout/stderr example (#186) - * Updated example/stdout.js to match debug current behaviour - * Renamed example/stderr.js to stdout.js - * Update Readme.md (#184) - * replace high intensity foreground color for bold (#182, #183) - -2.1.2 / 2015-03-01 -================== - - * dist: recompile - * update "ms" to v0.7.0 - * package: update "browserify" to v9.0.3 - * component: fix "ms.js" repo location - * changed bower package name - * updated documentation about using debug in a browser - * fix: security error on safari (#167, #168, @yields) - -2.1.1 / 2014-12-29 -================== - - * browser: use `typeof` to check for `console` existence - * browser: check for `console.log` truthiness (fix IE 8/9) - * browser: add support for Chrome apps - * Readme: added Windows usage remarks - * Add `bower.json` to properly support bower install - -2.1.0 / 2014-10-15 -================== - - * node: implement `DEBUG_FD` env variable support - * package: update "browserify" to v6.1.0 - * package: add "license" field to package.json (#135, @panuhorsmalahti) - -2.0.0 / 2014-09-01 -================== - - * package: update "browserify" to v5.11.0 - * node: use stderr rather than stdout for logging (#29, @stephenmathieson) - -1.0.4 / 2014-07-15 -================== - - * dist: recompile - * example: remove `console.info()` log usage - * example: add "Content-Type" UTF-8 header to browser example - * browser: place %c marker after the space character - * browser: reset the "content" color via `color: inherit` - * browser: add colors support for Firefox >= v31 - * debug: prefer an instance `log()` function over the global one (#119) - * Readme: update documentation about styled console logs for FF v31 (#116, @wryk) - -1.0.3 / 2014-07-09 -================== - - * Add support for multiple wildcards in namespaces (#122, @seegno) - * browser: fix lint - -1.0.2 / 2014-06-10 -================== - - * browser: update color palette (#113, @gscottolson) - * common: make console logging function configurable (#108, @timoxley) - * node: fix %o colors on old node <= 0.8.x - * Makefile: find node path using shell/which (#109, @timoxley) - -1.0.1 / 2014-06-06 -================== - - * browser: use `removeItem()` to clear localStorage - * browser, node: don't set DEBUG if namespaces is undefined (#107, @leedm777) - * package: add "contributors" section - * node: fix comment typo - * README: list authors - -1.0.0 / 2014-06-04 -================== - - * make ms diff be global, not be scope - * debug: ignore empty strings in enable() - * node: make DEBUG_COLORS able to disable coloring - * *: export the `colors` array - * npmignore: don't publish the `dist` dir - * Makefile: refactor to use browserify - * package: add "browserify" as a dev dependency - * Readme: add Web Inspector Colors section - * node: reset terminal color for the debug content - * node: map "%o" to `util.inspect()` - * browser: map "%j" to `JSON.stringify()` - * debug: add custom "formatters" - * debug: use "ms" module for humanizing the diff - * Readme: add "bash" syntax highlighting - * browser: add Firebug color support - * browser: add colors for WebKit browsers - * node: apply log to `console` - * rewrite: abstract common logic for Node & browsers - * add .jshintrc file - -0.8.1 / 2014-04-14 -================== - - * package: re-add the "component" section - -0.8.0 / 2014-03-30 -================== - - * add `enable()` method for nodejs. Closes #27 - * change from stderr to stdout - * remove unnecessary index.js file - -0.7.4 / 2013-11-13 -================== - - * remove "browserify" key from package.json (fixes something in browserify) - -0.7.3 / 2013-10-30 -================== - - * fix: catch localStorage security error when cookies are blocked (Chrome) - * add debug(err) support. Closes #46 - * add .browser prop to package.json. Closes #42 - -0.7.2 / 2013-02-06 -================== - - * fix package.json - * fix: Mobile Safari (private mode) is broken with debug - * fix: Use unicode to send escape character to shell instead of octal to work with strict mode javascript - -0.7.1 / 2013-02-05 -================== - - * add repository URL to package.json - * add DEBUG_COLORED to force colored output - * add browserify support - * fix component. Closes #24 - -0.7.0 / 2012-05-04 -================== - - * Added .component to package.json - * Added debug.component.js build - -0.6.0 / 2012-03-16 -================== - - * Added support for "-" prefix in DEBUG [Vinay Pulim] - * Added `.enabled` flag to the node version [TooTallNate] - -0.5.0 / 2012-02-02 -================== - - * Added: humanize diffs. Closes #8 - * Added `debug.disable()` to the CS variant - * Removed padding. Closes #10 - * Fixed: persist client-side variant again. Closes #9 - -0.4.0 / 2012-02-01 -================== - - * Added browser variant support for older browsers [TooTallNate] - * Added `debug.enable('project:*')` to browser variant [TooTallNate] - * Added padding to diff (moved it to the right) - -0.3.0 / 2012-01-26 -================== - - * Added millisecond diff when isatty, otherwise UTC string - -0.2.0 / 2012-01-22 -================== - - * Added wildcard support - -0.1.0 / 2011-12-02 -================== - - * Added: remove colors unless stderr isatty [TooTallNate] - -0.0.1 / 2010-01-03 -================== - - * Initial release diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/LICENSE b/nodejs/node_modules/finalhandler/node_modules/debug/LICENSE deleted file mode 100644 index 658c933d2..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -(The MIT License) - -Copyright (c) 2014 TJ Holowaychuk - -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/nodejs/node_modules/finalhandler/node_modules/debug/Makefile b/nodejs/node_modules/finalhandler/node_modules/debug/Makefile deleted file mode 100644 index 584da8bf9..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# get Makefile directory name: http://stackoverflow.com/a/5982798/376773 -THIS_MAKEFILE_PATH:=$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -THIS_DIR:=$(shell cd $(dir $(THIS_MAKEFILE_PATH));pwd) - -# BIN directory -BIN := $(THIS_DIR)/node_modules/.bin - -# Path -PATH := node_modules/.bin:$(PATH) -SHELL := /bin/bash - -# applications -NODE ?= $(shell which node) -YARN ?= $(shell which yarn) -PKG ?= $(if $(YARN),$(YARN),$(NODE) $(shell which npm)) -BROWSERIFY ?= $(NODE) $(BIN)/browserify - -.FORCE: - -install: node_modules - -node_modules: package.json - @NODE_ENV= $(PKG) install - @touch node_modules - -lint: .FORCE - eslint browser.js debug.js index.js node.js - -test-node: .FORCE - istanbul cover node_modules/mocha/bin/_mocha -- test/**.js - -test-browser: .FORCE - mkdir -p dist - - @$(BROWSERIFY) \ - --standalone debug \ - . > dist/debug.js - - karma start --single-run - rimraf dist - -test: .FORCE - concurrently \ - "make test-node" \ - "make test-browser" - -coveralls: - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js - -.PHONY: all install clean distclean diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/README.md b/nodejs/node_modules/finalhandler/node_modules/debug/README.md deleted file mode 100644 index 4aeab13f1..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/README.md +++ /dev/null @@ -1,312 +0,0 @@ -# debug -[![Build Status](https://travis-ci.org/visionmedia/debug.svg?branch=master)](https://travis-ci.org/visionmedia/debug) [![Coverage Status](https://coveralls.io/repos/github/visionmedia/debug/badge.svg?branch=master)](https://coveralls.io/github/visionmedia/debug?branch=master) [![Slack](https://visionmedia-community-slackin.now.sh/badge.svg)](https://visionmedia-community-slackin.now.sh/) [![OpenCollective](https://opencollective.com/debug/backers/badge.svg)](#backers) -[![OpenCollective](https://opencollective.com/debug/sponsors/badge.svg)](#sponsors) - - - -A tiny node.js debugging utility modelled after node core's debugging technique. - -**Discussion around the V3 API is under way [here](https://github.com/visionmedia/debug/issues/370)** - -## Installation - -```bash -$ npm install debug -``` - -## Usage - -`debug` exposes a function; simply pass this function the name of your module, and it will return a decorated version of `console.error` for you to pass debug statements to. This will allow you to toggle the debug output for different parts of your module as well as the module as a whole. - -Example _app.js_: - -```js -var debug = require('debug')('http') - , http = require('http') - , name = 'My App'; - -// fake app - -debug('booting %s', name); - -http.createServer(function(req, res){ - debug(req.method + ' ' + req.url); - res.end('hello\n'); -}).listen(3000, function(){ - debug('listening'); -}); - -// fake worker of some kind - -require('./worker'); -``` - -Example _worker.js_: - -```js -var debug = require('debug')('worker'); - -setInterval(function(){ - debug('doing some work'); -}, 1000); -``` - - The __DEBUG__ environment variable is then used to enable these based on space or comma-delimited names. Here are some examples: - - ![debug http and worker](http://f.cl.ly/items/18471z1H402O24072r1J/Screenshot.png) - - ![debug worker](http://f.cl.ly/items/1X413v1a3M0d3C2c1E0i/Screenshot.png) - -#### Windows note - - On Windows the environment variable is set using the `set` command. - - ```cmd - set DEBUG=*,-not_this - ``` - - Note that PowerShell uses different syntax to set environment variables. - - ```cmd - $env:DEBUG = "*,-not_this" - ``` - -Then, run the program to be debugged as usual. - -## Millisecond diff - - When actively developing an application it can be useful to see when the time spent between one `debug()` call and the next. Suppose for example you invoke `debug()` before requesting a resource, and after as well, the "+NNNms" will show you how much time was spent between calls. - - ![](http://f.cl.ly/items/2i3h1d3t121M2Z1A3Q0N/Screenshot.png) - - When stdout is not a TTY, `Date#toUTCString()` is used, making it more useful for logging the debug information as shown below: - - ![](http://f.cl.ly/items/112H3i0e0o0P0a2Q2r11/Screenshot.png) - -## Conventions - - If you're using this in one or more of your libraries, you _should_ use the name of your library so that developers may toggle debugging as desired without guessing names. If you have more than one debuggers you _should_ prefix them with your library name and use ":" to separate features. For example "bodyParser" from Connect would then be "connect:bodyParser". - -## Wildcards - - The `*` character may be used as a wildcard. Suppose for example your library has debuggers named "connect:bodyParser", "connect:compress", "connect:session", instead of listing all three with `DEBUG=connect:bodyParser,connect:compress,connect:session`, you may simply do `DEBUG=connect:*`, or to run everything using this module simply use `DEBUG=*`. - - You can also exclude specific debuggers by prefixing them with a "-" character. For example, `DEBUG=*,-connect:*` would include all debuggers except those starting with "connect:". - -## Environment Variables - - When running through Node.js, you can set a few environment variables that will - change the behavior of the debug logging: - -| Name | Purpose | -|-----------|-------------------------------------------------| -| `DEBUG` | Enables/disabled specific debugging namespaces. | -| `DEBUG_COLORS`| Whether or not to use colors in the debug output. | -| `DEBUG_DEPTH` | Object inspection depth. | -| `DEBUG_SHOW_HIDDEN` | Shows hidden properties on inspected objects. | - - - __Note:__ The environment variables beginning with `DEBUG_` end up being - converted into an Options object that gets used with `%o`/`%O` formatters. - See the Node.js documentation for - [`util.inspect()`](https://nodejs.org/api/util.html#util_util_inspect_object_options) - for the complete list. - -## Formatters - - - Debug uses [printf-style](https://wikipedia.org/wiki/Printf_format_string) formatting. Below are the officially supported formatters: - -| Formatter | Representation | -|-----------|----------------| -| `%O` | Pretty-print an Object on multiple lines. | -| `%o` | Pretty-print an Object all on a single line. | -| `%s` | String. | -| `%d` | Number (both integer and float). | -| `%j` | JSON. Replaced with the string '[Circular]' if the argument contains circular references. | -| `%%` | Single percent sign ('%'). This does not consume an argument. | - -### Custom formatters - - You can add custom formatters by extending the `debug.formatters` object. For example, if you wanted to add support for rendering a Buffer as hex with `%h`, you could do something like: - -```js -const createDebug = require('debug') -createDebug.formatters.h = (v) => { - return v.toString('hex') -} - -// …elsewhere -const debug = createDebug('foo') -debug('this is hex: %h', new Buffer('hello world')) -// foo this is hex: 68656c6c6f20776f726c6421 +0ms -``` - -## Browser support - You can build a browser-ready script using [browserify](https://github.com/substack/node-browserify), - or just use the [browserify-as-a-service](https://wzrd.in/) [build](https://wzrd.in/standalone/debug@latest), - if you don't want to build it yourself. - - Debug's enable state is currently persisted by `localStorage`. - Consider the situation shown below where you have `worker:a` and `worker:b`, - and wish to debug both. You can enable this using `localStorage.debug`: - -```js -localStorage.debug = 'worker:*' -``` - -And then refresh the page. - -```js -a = debug('worker:a'); -b = debug('worker:b'); - -setInterval(function(){ - a('doing some work'); -}, 1000); - -setInterval(function(){ - b('doing some work'); -}, 1200); -``` - -#### Web Inspector Colors - - Colors are also enabled on "Web Inspectors" that understand the `%c` formatting - option. These are WebKit web inspectors, Firefox ([since version - 31](https://hacks.mozilla.org/2014/05/editable-box-model-multiple-selection-sublime-text-keys-much-more-firefox-developer-tools-episode-31/)) - and the Firebug plugin for Firefox (any version). - - Colored output looks something like: - - ![](https://cloud.githubusercontent.com/assets/71256/3139768/b98c5fd8-e8ef-11e3-862a-f7253b6f47c6.png) - - -## Output streams - - By default `debug` will log to stderr, however this can be configured per-namespace by overriding the `log` method: - -Example _stdout.js_: - -```js -var debug = require('debug'); -var error = debug('app:error'); - -// by default stderr is used -error('goes to stderr!'); - -var log = debug('app:log'); -// set this namespace to log via console.log -log.log = console.log.bind(console); // don't forget to bind to console! -log('goes to stdout'); -error('still goes to stderr!'); - -// set all output to go via console.info -// overrides all per-namespace log settings -debug.log = console.info.bind(console); -error('now goes to stdout via console.info'); -log('still goes to stdout, but via console.info now'); -``` - - -## Authors - - - TJ Holowaychuk - - Nathan Rajlich - - Andrew Rhyne - -## Backers - -Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/debug#backer)] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -## Sponsors - -Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/debug#sponsor)] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -## License - -(The MIT License) - -Copyright (c) 2014-2016 TJ Holowaychuk <tj@vision-media.ca> - -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/nodejs/node_modules/finalhandler/node_modules/debug/component.json b/nodejs/node_modules/finalhandler/node_modules/debug/component.json deleted file mode 100644 index dd4030781..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/component.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "debug", - "repo": "visionmedia/debug", - "description": "small debugging utility", - "version": "2.6.4", - "keywords": [ - "debug", - "log", - "debugger" - ], - "main": "src/browser.js", - "scripts": [ - "src/browser.js", - "src/debug.js" - ], - "dependencies": { - "rauchg/ms.js": "0.7.1" - } -} diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/karma.conf.js b/nodejs/node_modules/finalhandler/node_modules/debug/karma.conf.js deleted file mode 100644 index 103a82d15..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/karma.conf.js +++ /dev/null @@ -1,70 +0,0 @@ -// Karma configuration -// Generated on Fri Dec 16 2016 13:09:51 GMT+0000 (UTC) - -module.exports = function(config) { - config.set({ - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '', - - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['mocha', 'chai', 'sinon'], - - - // list of files / patterns to load in the browser - files: [ - 'dist/debug.js', - 'test/*spec.js' - ], - - - // list of files to exclude - exclude: [ - 'src/node.js' - ], - - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - }, - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress'], - - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: true, - - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['PhantomJS'], - - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: false, - - // Concurrency level - // how many browser should be started simultaneous - concurrency: Infinity - }) -} diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/node.js b/nodejs/node_modules/finalhandler/node_modules/debug/node.js deleted file mode 100644 index 7fc36fe6d..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/node.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./src/node'); diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/package.json b/nodejs/node_modules/finalhandler/node_modules/debug/package.json deleted file mode 100644 index 65881369b..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/package.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "_args": [ - [ - { - "raw": "debug@2.6.4", - "scope": null, - "escapedName": "debug", - "name": "debug", - "rawSpec": "2.6.4", - "spec": "2.6.4", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/finalhandler" - ] - ], - "_from": "debug@2.6.4", - "_id": "debug@2.6.4", - "_inCache": true, - "_location": "/finalhandler/debug", - "_nodeVersion": "6.9.0", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/debug-2.6.4.tgz_1492711686326_0.05656863120384514" - }, - "_npmUser": { - "name": "thebigredgeek", - "email": "rhyneandrew@gmail.com" - }, - "_npmVersion": "4.0.3", - "_phantomChildren": {}, - "_requested": { - "raw": "debug@2.6.4", - "scope": null, - "escapedName": "debug", - "name": "debug", - "rawSpec": "2.6.4", - "spec": "2.6.4", - "type": "version" - }, - "_requiredBy": [ - "/finalhandler" - ], - "_resolved": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz", - "_shasum": "7586a9b3c39741c0282ae33445c4e8ac74734fe0", - "_shrinkwrap": null, - "_spec": "debug@2.6.4", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/finalhandler", - "author": { - "name": "TJ Holowaychuk", - "email": "tj@vision-media.ca" - }, - "browser": "./src/browser.js", - "bugs": { - "url": "https://github.com/visionmedia/debug/issues" - }, - "component": { - "scripts": { - "debug/index.js": "browser.js", - "debug/debug.js": "debug.js" - } - }, - "contributors": [ - { - "name": "Nathan Rajlich", - "email": "nathan@tootallnate.net", - "url": "http://n8.io" - }, - { - "name": "Andrew Rhyne", - "email": "rhyneandrew@gmail.com" - } - ], - "dependencies": { - "ms": "0.7.3" - }, - "description": "small debugging utility", - "devDependencies": { - "browserify": "9.0.3", - "chai": "^3.5.0", - "concurrently": "^3.1.0", - "coveralls": "^2.11.15", - "eslint": "^3.12.1", - "istanbul": "^0.4.5", - "karma": "^1.3.0", - "karma-chai": "^0.1.0", - "karma-mocha": "^1.3.0", - "karma-phantomjs-launcher": "^1.0.2", - "karma-sinon": "^1.0.5", - "mocha": "^3.2.0", - "mocha-lcov-reporter": "^1.2.0", - "rimraf": "^2.5.4", - "sinon": "^1.17.6", - "sinon-chai": "^2.8.0" - }, - "directories": {}, - "dist": { - "shasum": "7586a9b3c39741c0282ae33445c4e8ac74734fe0", - "tarball": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz" - }, - "gitHead": "f311b10b7b79efb33f4e23898ae6bbb152e94b16", - "homepage": "https://github.com/visionmedia/debug#readme", - "keywords": [ - "debug", - "log", - "debugger" - ], - "license": "MIT", - "main": "./src/index.js", - "maintainers": [ - { - "name": "thebigredgeek", - "email": "rhyneandrew@gmail.com" - } - ], - "name": "debug", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", - "repository": { - "type": "git", - "url": "git://github.com/visionmedia/debug.git" - }, - "scripts": {}, - "version": "2.6.4" -} diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/src/browser.js b/nodejs/node_modules/finalhandler/node_modules/debug/src/browser.js deleted file mode 100644 index e21c1e0b6..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/src/browser.js +++ /dev/null @@ -1,185 +0,0 @@ -/** - * This is the web browser implementation of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = require('./debug'); -exports.log = log; -exports.formatArgs = formatArgs; -exports.save = save; -exports.load = load; -exports.useColors = useColors; -exports.storage = 'undefined' != typeof chrome - && 'undefined' != typeof chrome.storage - ? chrome.storage.local - : localstorage(); - -/** - * Colors. - */ - -exports.colors = [ - 'lightseagreen', - 'forestgreen', - 'goldenrod', - 'dodgerblue', - 'darkorchid', - 'crimson' -]; - -/** - * Currently only WebKit-based Web Inspectors, Firefox >= v31, - * and the Firebug extension (any Firefox version) are known - * to support "%c" CSS customizations. - * - * TODO: add a `localStorage` variable to explicitly enable/disable colors - */ - -function useColors() { - // NB: In an Electron preload script, document will be defined but not fully - // initialized. Since we know we're in Chrome, we'll just detect this case - // explicitly - if (typeof window !== 'undefined' && window && typeof window.process !== 'undefined' && window.process.type === 'renderer') { - return true; - } - - // is webkit? http://stackoverflow.com/a/16459606/376773 - // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632 - return (typeof document !== 'undefined' && document && 'WebkitAppearance' in document.documentElement.style) || - // is firebug? http://stackoverflow.com/a/398120/376773 - (typeof window !== 'undefined' && window && window.console && (console.firebug || (console.exception && console.table))) || - // is firefox >= v31? - // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages - (typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) || - // double check webkit in userAgent just in case we are in a worker - (typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/)); -} - -/** - * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default. - */ - -exports.formatters.j = function(v) { - try { - return JSON.stringify(v); - } catch (err) { - return '[UnexpectedJSONParseError]: ' + err.message; - } -}; - - -/** - * Colorize log arguments if enabled. - * - * @api public - */ - -function formatArgs(args) { - var useColors = this.useColors; - - args[0] = (useColors ? '%c' : '') - + this.namespace - + (useColors ? ' %c' : ' ') - + args[0] - + (useColors ? '%c ' : ' ') - + '+' + exports.humanize(this.diff); - - if (!useColors) return; - - var c = 'color: ' + this.color; - args.splice(1, 0, c, 'color: inherit') - - // the final "%c" is somewhat tricky, because there could be other - // arguments passed either before or after the %c, so we need to - // figure out the correct index to insert the CSS into - var index = 0; - var lastC = 0; - args[0].replace(/%[a-zA-Z%]/g, function(match) { - if ('%%' === match) return; - index++; - if ('%c' === match) { - // we only are interested in the *last* %c - // (the user may have provided their own) - lastC = index; - } - }); - - args.splice(lastC, 0, c); -} - -/** - * Invokes `console.log()` when available. - * No-op when `console.log` is not a "function". - * - * @api public - */ - -function log() { - // this hackery is required for IE8/9, where - // the `console.log` function doesn't have 'apply' - return 'object' === typeof console - && console.log - && Function.prototype.apply.call(console.log, console, arguments); -} - -/** - * Save `namespaces`. - * - * @param {String} namespaces - * @api private - */ - -function save(namespaces) { - try { - if (null == namespaces) { - exports.storage.removeItem('debug'); - } else { - exports.storage.debug = namespaces; - } - } catch(e) {} -} - -/** - * Load `namespaces`. - * - * @return {String} returns the previously persisted debug modes - * @api private - */ - -function load() { - var r; - try { - r = exports.storage.debug; - } catch(e) {} - - // If debug isn't set in LS, and we're in Electron, try to load $DEBUG - if (!r && typeof process !== 'undefined' && 'env' in process) { - r = process.env.DEBUG; - } - - return r; -} - -/** - * Enable namespaces listed in `localStorage.debug` initially. - */ - -exports.enable(load()); - -/** - * Localstorage attempts to return the localstorage. - * - * This is necessary because safari throws - * when a user disables cookies/localstorage - * and you attempt to access it. - * - * @return {LocalStorage} - * @api private - */ - -function localstorage() { - try { - return window.localStorage; - } catch (e) {} -} diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/src/debug.js b/nodejs/node_modules/finalhandler/node_modules/debug/src/debug.js deleted file mode 100644 index 6a5e3fc94..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/src/debug.js +++ /dev/null @@ -1,202 +0,0 @@ - -/** - * This is the common logic for both the Node.js and web browser - * implementations of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = createDebug.debug = createDebug['default'] = createDebug; -exports.coerce = coerce; -exports.disable = disable; -exports.enable = enable; -exports.enabled = enabled; -exports.humanize = require('ms'); - -/** - * The currently active debug mode names, and names to skip. - */ - -exports.names = []; -exports.skips = []; - -/** - * Map of special "%n" handling functions, for the debug "format" argument. - * - * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N". - */ - -exports.formatters = {}; - -/** - * Previous log timestamp. - */ - -var prevTime; - -/** - * Select a color. - * @param {String} namespace - * @return {Number} - * @api private - */ - -function selectColor(namespace) { - var hash = 0, i; - - for (i in namespace) { - hash = ((hash << 5) - hash) + namespace.charCodeAt(i); - hash |= 0; // Convert to 32bit integer - } - - return exports.colors[Math.abs(hash) % exports.colors.length]; -} - -/** - * Create a debugger with the given `namespace`. - * - * @param {String} namespace - * @return {Function} - * @api public - */ - -function createDebug(namespace) { - - function debug() { - // disabled? - if (!debug.enabled) return; - - var self = debug; - - // set `diff` timestamp - var curr = +new Date(); - var ms = curr - (prevTime || curr); - self.diff = ms; - self.prev = prevTime; - self.curr = curr; - prevTime = curr; - - // turn the `arguments` into a proper Array - var args = new Array(arguments.length); - for (var i = 0; i < args.length; i++) { - args[i] = arguments[i]; - } - - args[0] = exports.coerce(args[0]); - - if ('string' !== typeof args[0]) { - // anything else let's inspect with %O - args.unshift('%O'); - } - - // apply any `formatters` transformations - var index = 0; - args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) { - // if we encounter an escaped % then don't increase the array index - if (match === '%%') return match; - index++; - var formatter = exports.formatters[format]; - if ('function' === typeof formatter) { - var val = args[index]; - match = formatter.call(self, val); - - // now we need to remove `args[index]` since it's inlined in the `format` - args.splice(index, 1); - index--; - } - return match; - }); - - // apply env-specific formatting (colors, etc.) - exports.formatArgs.call(self, args); - - var logFn = debug.log || exports.log || console.log.bind(console); - logFn.apply(self, args); - } - - debug.namespace = namespace; - debug.enabled = exports.enabled(namespace); - debug.useColors = exports.useColors(); - debug.color = selectColor(namespace); - - // env-specific initialization logic for debug instances - if ('function' === typeof exports.init) { - exports.init(debug); - } - - return debug; -} - -/** - * Enables a debug mode by namespaces. This can include modes - * separated by a colon and wildcards. - * - * @param {String} namespaces - * @api public - */ - -function enable(namespaces) { - exports.save(namespaces); - - exports.names = []; - exports.skips = []; - - var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/); - var len = split.length; - - for (var i = 0; i < len; i++) { - if (!split[i]) continue; // ignore empty strings - namespaces = split[i].replace(/\*/g, '.*?'); - if (namespaces[0] === '-') { - exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$')); - } else { - exports.names.push(new RegExp('^' + namespaces + '$')); - } - } -} - -/** - * Disable debug output. - * - * @api public - */ - -function disable() { - exports.enable(''); -} - -/** - * Returns true if the given mode name is enabled, false otherwise. - * - * @param {String} name - * @return {Boolean} - * @api public - */ - -function enabled(name) { - var i, len; - for (i = 0, len = exports.skips.length; i < len; i++) { - if (exports.skips[i].test(name)) { - return false; - } - } - for (i = 0, len = exports.names.length; i < len; i++) { - if (exports.names[i].test(name)) { - return true; - } - } - return false; -} - -/** - * Coerce `val`. - * - * @param {Mixed} val - * @return {Mixed} - * @api private - */ - -function coerce(val) { - if (val instanceof Error) return val.stack || val.message; - return val; -} diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/src/index.js b/nodejs/node_modules/finalhandler/node_modules/debug/src/index.js deleted file mode 100644 index e12cf4d58..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/src/index.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Detect Electron renderer process, which is node, but we should - * treat as a browser. - */ - -if (typeof process !== 'undefined' && process.type === 'renderer') { - module.exports = require('./browser.js'); -} else { - module.exports = require('./node.js'); -} diff --git a/nodejs/node_modules/finalhandler/node_modules/debug/src/node.js b/nodejs/node_modules/finalhandler/node_modules/debug/src/node.js deleted file mode 100644 index 3c7407b6b..000000000 --- a/nodejs/node_modules/finalhandler/node_modules/debug/src/node.js +++ /dev/null @@ -1,241 +0,0 @@ -/** - * Module dependencies. - */ - -var tty = require('tty'); -var util = require('util'); - -/** - * This is the Node.js implementation of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = require('./debug'); -exports.init = init; -exports.log = log; -exports.formatArgs = formatArgs; -exports.save = save; -exports.load = load; -exports.useColors = useColors; - -/** - * Colors. - */ - -exports.colors = [6, 2, 3, 4, 5, 1]; - -/** - * Build up the default `inspectOpts` object from the environment variables. - * - * $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js - */ - -exports.inspectOpts = Object.keys(process.env).filter(function (key) { - return /^debug_/i.test(key); -}).reduce(function (obj, key) { - // camel-case - var prop = key - .substring(6) - .toLowerCase() - .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() }); - - // coerce string value into JS value - var val = process.env[key]; - if (/^(yes|on|true|enabled)$/i.test(val)) val = true; - else if (/^(no|off|false|disabled)$/i.test(val)) val = false; - else if (val === 'null') val = null; - else val = Number(val); - - obj[prop] = val; - return obj; -}, {}); - -/** - * The file descriptor to write the `debug()` calls to. - * Set the `DEBUG_FD` env variable to override with another value. i.e.: - * - * $ DEBUG_FD=3 node script.js 3>debug.log - */ - -var fd = parseInt(process.env.DEBUG_FD, 10) || 2; - -if (1 !== fd && 2 !== fd) { - util.deprecate(function(){}, 'except for stderr(2) and stdout(1), any other usage of DEBUG_FD is deprecated. Override debug.log if you want to use a different log function (https://git.io/debug_fd)')() -} - -var stream = 1 === fd ? process.stdout : - 2 === fd ? process.stderr : - createWritableStdioStream(fd); - -/** - * Is stdout a TTY? Colored output is enabled when `true`. - */ - -function useColors() { - return 'colors' in exports.inspectOpts - ? Boolean(exports.inspectOpts.colors) - : tty.isatty(fd); -} - -/** - * Map %o to `util.inspect()`, all on a single line. - */ - -exports.formatters.o = function(v) { - this.inspectOpts.colors = this.useColors; - return util.inspect(v, this.inspectOpts) - .replace(/\s*\n\s*/g, ' '); -}; - -/** - * Map %o to `util.inspect()`, allowing multiple lines if needed. - */ - -exports.formatters.O = function(v) { - this.inspectOpts.colors = this.useColors; - return util.inspect(v, this.inspectOpts); -}; - -/** - * Adds ANSI color escape codes if enabled. - * - * @api public - */ - -function formatArgs(args) { - var name = this.namespace; - var useColors = this.useColors; - - if (useColors) { - var c = this.color; - var prefix = ' \u001b[3' + c + ';1m' + name + ' ' + '\u001b[0m'; - - args[0] = prefix + args[0].split('\n').join('\n' + prefix); - args.push('\u001b[3' + c + 'm+' + exports.humanize(this.diff) + '\u001b[0m'); - } else { - args[0] = new Date().toUTCString() - + ' ' + name + ' ' + args[0]; - } -} - -/** - * Invokes `util.format()` with the specified arguments and writes to `stream`. - */ - -function log() { - return stream.write(util.format.apply(util, arguments) + '\n'); -} - -/** - * Save `namespaces`. - * - * @param {String} namespaces - * @api private - */ - -function save(namespaces) { - if (null == namespaces) { - // If you set a process.env field to null or undefined, it gets cast to the - // string 'null' or 'undefined'. Just delete instead. - delete process.env.DEBUG; - } else { - process.env.DEBUG = namespaces; - } -} - -/** - * Load `namespaces`. - * - * @return {String} returns the previously persisted debug modes - * @api private - */ - -function load() { - return process.env.DEBUG; -} - -/** - * Copied from `node/src/node.js`. - * - * XXX: It's lame that node doesn't expose this API out-of-the-box. It also - * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame. - */ - -function createWritableStdioStream (fd) { - var stream; - var tty_wrap = process.binding('tty_wrap'); - - // Note stream._type is used for test-module-load-list.js - - switch (tty_wrap.guessHandleType(fd)) { - case 'TTY': - stream = new tty.WriteStream(fd); - stream._type = 'tty'; - - // Hack to have stream not keep the event loop alive. - // See https://github.com/joyent/node/issues/1726 - if (stream._handle && stream._handle.unref) { - stream._handle.unref(); - } - break; - - case 'FILE': - var fs = require('fs'); - stream = new fs.SyncWriteStream(fd, { autoClose: false }); - stream._type = 'fs'; - break; - - case 'PIPE': - case 'TCP': - var net = require('net'); - stream = new net.Socket({ - fd: fd, - readable: false, - writable: true - }); - - // FIXME Should probably have an option in net.Socket to create a - // stream from an existing fd which is writable only. But for now - // we'll just add this hack and set the `readable` member to false. - // Test: ./node test/fixtures/echo.js < /etc/passwd - stream.readable = false; - stream.read = null; - stream._type = 'pipe'; - - // FIXME Hack to have stream not keep the event loop alive. - // See https://github.com/joyent/node/issues/1726 - if (stream._handle && stream._handle.unref) { - stream._handle.unref(); - } - break; - - default: - // Probably an error on in uv_guess_handle() - throw new Error('Implement me. Unknown stream file type!'); - } - - // For supporting legacy API we put the FD here. - stream.fd = fd; - - stream._isStdio = true; - - return stream; -} - -/** - * Init logic for `debug` instances. - * - * Create a new `inspectOpts` object in case `useColors` is set - * differently for a particular `debug` instance. - */ - -function init (debug) { - debug.inspectOpts = util._extend({}, exports.inspectOpts); -} - -/** - * Enable namespaces listed in `process.env.DEBUG` initially. - */ - -exports.enable(load()); diff --git a/nodejs/node_modules/finalhandler/package.json b/nodejs/node_modules/finalhandler/package.json index b6c27a4de..c7aa7deb1 100644 --- a/nodejs/node_modules/finalhandler/package.json +++ b/nodejs/node_modules/finalhandler/package.json @@ -1,52 +1,32 @@ { "_args": [ [ - { - "raw": "finalhandler@~1.0.0", - "scope": null, - "escapedName": "finalhandler", - "name": "finalhandler", - "rawSpec": "~1.0.0", - "spec": ">=1.0.0 <1.1.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "finalhandler@1.1.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "finalhandler@>=1.0.0 <1.1.0", - "_id": "finalhandler@1.0.2", - "_inCache": true, + "_from": "finalhandler@1.1.0", + "_id": "finalhandler@1.1.0", + "_inBundle": false, + "_integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", "_location": "/finalhandler", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/finalhandler-1.0.2.tgz_1492903233024_0.34017785592004657" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", - "_phantomChildren": { - "ms": "0.7.3" - }, + "_phantomChildren": {}, "_requested": { - "raw": "finalhandler@~1.0.0", - "scope": null, - "escapedName": "finalhandler", + "type": "version", + "registry": true, + "raw": "finalhandler@1.1.0", "name": "finalhandler", - "rawSpec": "~1.0.0", - "spec": ">=1.0.0 <1.1.0", - "type": "range" + "escapedName": "finalhandler", + "rawSpec": "1.1.0", + "saveSpec": null, + "fetchSpec": "1.1.0" }, "_requiredBy": [ "/express" ], - "_resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.2.tgz", - "_shasum": "d0e36f9dbc557f2de14423df6261889e9d60c93a", - "_shrinkwrap": null, - "_spec": "finalhandler@~1.0.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", + "_spec": "1.1.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" @@ -55,11 +35,11 @@ "url": "https://github.com/pillarjs/finalhandler/issues" }, "dependencies": { - "debug": "2.6.4", + "debug": "2.6.9", "encodeurl": "~1.0.1", "escape-html": "~1.0.3", "on-finished": "~2.3.0", - "parseurl": "~1.3.1", + "parseurl": "~1.3.2", "statuses": "~1.3.1", "unpipe": "~1.0.0" }, @@ -67,22 +47,17 @@ "devDependencies": { "eslint": "3.19.0", "eslint-config-standard": "10.2.1", - "eslint-plugin-import": "2.2.0", - "eslint-plugin-markdown": "1.0.0-beta.4", - "eslint-plugin-node": "4.2.2", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", "eslint-plugin-promise": "3.5.0", "eslint-plugin-standard": "3.0.1", "istanbul": "0.4.5", "mocha": "2.5.3", - "readable-stream": "2.2.9", - "safe-buffer": "5.0.1", + "readable-stream": "2.3.3", + "safe-buffer": "5.1.1", "supertest": "1.1.0" }, - "directories": {}, - "dist": { - "shasum": "d0e36f9dbc557f2de14423df6261889e9d60c93a", - "tarball": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.2.tgz" - }, "engines": { "node": ">= 0.8" }, @@ -91,18 +66,9 @@ "HISTORY.md", "index.js" ], - "gitHead": "fdc51081ce2747d28855f4d6ac9d418379f509ed", "homepage": "https://github.com/pillarjs/finalhandler#readme", "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "finalhandler", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/pillarjs/finalhandler.git" @@ -113,5 +79,5 @@ "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/" }, - "version": "1.0.2" + "version": "1.1.0" } diff --git a/nodejs/node_modules/forwarded/HISTORY.md b/nodejs/node_modules/forwarded/HISTORY.md index 97fa1d102..2599a5573 100644 --- a/nodejs/node_modules/forwarded/HISTORY.md +++ b/nodejs/node_modules/forwarded/HISTORY.md @@ -1,3 +1,15 @@ +0.1.2 / 2017-09-14 +================== + + * perf: improve header parsing + * perf: reduce overhead when no `X-Forwarded-For` header + +0.1.1 / 2017-09-10 +================== + + * Fix trimming leading / trailing OWS + * perf: hoist regular expression + 0.1.0 / 2014-09-21 ================== diff --git a/nodejs/node_modules/forwarded/LICENSE b/nodejs/node_modules/forwarded/LICENSE index b7dce6cf9..84441fbb5 100644 --- a/nodejs/node_modules/forwarded/LICENSE +++ b/nodejs/node_modules/forwarded/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (c) 2014 Douglas Christopher Wilson +Copyright (c) 2014-2017 Douglas Christopher Wilson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/nodejs/node_modules/forwarded/README.md b/nodejs/node_modules/forwarded/README.md index 2b4988fa2..c776ee54e 100644 --- a/nodejs/node_modules/forwarded/README.md +++ b/nodejs/node_modules/forwarded/README.md @@ -10,6 +10,10 @@ Parse HTTP X-Forwarded-For header ## Installation +This is a [Node.js](https://nodejs.org/en/) module available through the +[npm registry](https://www.npmjs.com/). Installation is done using the +[`npm install` command](https://docs.npmjs.com/getting-started/installing-npm-packages-locally): + ```sh $ npm install forwarded ``` @@ -27,7 +31,7 @@ var addresses = forwarded(req) ``` Parse the `X-Forwarded-For` header from the request. Returns an array -of the addresses, including the socket address for the `req`. In reverse +of the addresses, including the socket address for the `req`, in reverse order (i.e. index `0` is the socket address and the last index is the furthest address, typically the end-user). @@ -41,13 +45,13 @@ $ npm test [MIT](LICENSE) -[npm-image]: https://img.shields.io/npm/v/forwarded.svg?style=flat +[npm-image]: https://img.shields.io/npm/v/forwarded.svg [npm-url]: https://npmjs.org/package/forwarded -[node-version-image]: https://img.shields.io/node/v/forwarded.svg?style=flat -[node-version-url]: http://nodejs.org/download/ -[travis-image]: https://img.shields.io/travis/jshttp/forwarded.svg?style=flat +[node-version-image]: https://img.shields.io/node/v/forwarded.svg +[node-version-url]: https://nodejs.org/en/download/ +[travis-image]: https://img.shields.io/travis/jshttp/forwarded/master.svg [travis-url]: https://travis-ci.org/jshttp/forwarded -[coveralls-image]: https://img.shields.io/coveralls/jshttp/forwarded.svg?style=flat +[coveralls-image]: https://img.shields.io/coveralls/jshttp/forwarded/master.svg [coveralls-url]: https://coveralls.io/r/jshttp/forwarded?branch=master -[downloads-image]: https://img.shields.io/npm/dm/forwarded.svg?style=flat +[downloads-image]: https://img.shields.io/npm/dm/forwarded.svg [downloads-url]: https://npmjs.org/package/forwarded diff --git a/nodejs/node_modules/forwarded/index.js b/nodejs/node_modules/forwarded/index.js index 2f5c34088..7833b3de5 100644 --- a/nodejs/node_modules/forwarded/index.js +++ b/nodejs/node_modules/forwarded/index.js @@ -1,11 +1,14 @@ /*! * forwarded - * Copyright(c) 2014 Douglas Christopher Wilson + * Copyright(c) 2014-2017 Douglas Christopher Wilson * MIT Licensed */ +'use strict' + /** * Module exports. + * @public */ module.exports = forwarded @@ -13,23 +16,61 @@ module.exports = forwarded /** * Get all addresses in the request, using the `X-Forwarded-For` header. * - * @param {Object} req - * @api public + * @param {object} req + * @return {array} + * @public */ -function forwarded(req) { +function forwarded (req) { if (!req) { throw new TypeError('argument req is required') } // simple header parsing - var proxyAddrs = (req.headers['x-forwarded-for'] || '') - .split(/ *, */) - .filter(Boolean) - .reverse() + var proxyAddrs = parse(req.headers['x-forwarded-for'] || '') var socketAddr = req.connection.remoteAddress var addrs = [socketAddr].concat(proxyAddrs) // return all addresses return addrs } + +/** + * Parse the X-Forwarded-For header. + * + * @param {string} header + * @private + */ + +function parse (header) { + var end = header.length + var list = [] + var start = header.length + + // gather addresses, backwards + for (var i = header.length - 1; i >= 0; i--) { + switch (header.charCodeAt(i)) { + case 0x20: /* */ + if (start === end) { + start = end = i + } + break + case 0x2c: /* , */ + if (start !== end) { + list.push(header.substring(start, end)) + } + start = end = i + break + default: + start = i + break + } + } + + // final address + if (start !== end) { + list.push(header.substring(start, end)) + } + + return list +} diff --git a/nodejs/node_modules/forwarded/package.json b/nodejs/node_modules/forwarded/package.json index 0755cc4dc..67058b77a 100644 --- a/nodejs/node_modules/forwarded/package.json +++ b/nodejs/node_modules/forwarded/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "forwarded@~0.1.0", - "scope": null, - "escapedName": "forwarded", - "name": "forwarded", - "rawSpec": "~0.1.0", - "spec": ">=0.1.0 <0.2.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/proxy-addr" + "forwarded@0.1.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "forwarded@>=0.1.0 <0.2.0", - "_id": "forwarded@0.1.0", - "_inCache": true, + "_from": "forwarded@0.1.2", + "_id": "forwarded@0.1.2", + "_inBundle": false, + "_integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", "_location": "/forwarded", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.21", "_phantomChildren": {}, "_requested": { - "raw": "forwarded@~0.1.0", - "scope": null, - "escapedName": "forwarded", + "type": "version", + "registry": true, + "raw": "forwarded@0.1.2", "name": "forwarded", - "rawSpec": "~0.1.0", - "spec": ">=0.1.0 <0.2.0", - "type": "range" + "escapedName": "forwarded", + "rawSpec": "0.1.2", + "saveSpec": null, + "fetchSpec": "0.1.2" }, "_requiredBy": [ "/proxy-addr" ], - "_resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", - "_shasum": "19ef9874c4ae1c297bcf078fde63a09b66a84363", - "_shrinkwrap": null, - "_spec": "forwarded@~0.1.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/proxy-addr", + "_resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "_spec": "0.1.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/forwarded/issues" }, @@ -49,16 +36,18 @@ "email": "doug@somethingdoug.com" } ], - "dependencies": {}, "description": "Parse HTTP X-Forwarded-For header", "devDependencies": { - "istanbul": "0.3.2", - "mocha": "~1.21.4" - }, - "directories": {}, - "dist": { - "shasum": "19ef9874c4ae1c297bcf078fde63a09b66a84363", - "tarball": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz" + "beautify-benchmark": "0.2.4", + "benchmark": "2.1.4", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", + "istanbul": "0.4.5", + "mocha": "1.21.5" }, "engines": { "node": ">= 0.6" @@ -69,31 +58,24 @@ "README.md", "index.js" ], - "gitHead": "e9a9faeb3cfaadf40eb57d144fff26bca9b818e8", - "homepage": "https://github.com/jshttp/forwarded", + "homepage": "https://github.com/jshttp/forwarded#readme", "keywords": [ "x-forwarded-for", "http", "req" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "forwarded", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/forwarded.git" }, "scripts": { + "bench": "node benchmark/index.js", + "lint": "eslint .", "test": "mocha --reporter spec --bail --check-leaks test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/", "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/" }, - "version": "0.1.0" + "version": "0.1.2" } diff --git a/nodejs/node_modules/fresh/HISTORY.md b/nodejs/node_modules/fresh/HISTORY.md index edd6c0586..4586996a3 100644 --- a/nodejs/node_modules/fresh/HISTORY.md +++ b/nodejs/node_modules/fresh/HISTORY.md @@ -1,3 +1,15 @@ +0.5.2 / 2017-09-13 +================== + + * Fix regression matching multiple ETags in `If-None-Match` + * perf: improve `If-None-Match` token parsing + +0.5.1 / 2017-09-11 +================== + + * Fix handling of modified headers with invalid dates + * perf: improve ETag match loop + 0.5.0 / 2017-02-21 ================== diff --git a/nodejs/node_modules/fresh/README.md b/nodejs/node_modules/fresh/README.md index d2b63e59c..1c1c680d1 100644 --- a/nodejs/node_modules/fresh/README.md +++ b/nodejs/node_modules/fresh/README.md @@ -20,6 +20,8 @@ $ npm install fresh ## API + + ```js var fresh = require('fresh') ``` @@ -55,6 +57,8 @@ links to further reading on this Safari bug. ### API usage + + ```js var reqHeaders = { 'if-none-match': '"foo"' } var resHeaders = { 'etag': '"bar"' } @@ -85,6 +89,8 @@ var server = http.createServer(function (req, res) { } // send the resource + res.statusCode = 200 + res.end('hello, world!') }) function isFresh (req, res) { diff --git a/nodejs/node_modules/fresh/index.js b/nodejs/node_modules/fresh/index.js index bd9812ef3..d154f5a7d 100644 --- a/nodejs/node_modules/fresh/index.js +++ b/nodejs/node_modules/fresh/index.js @@ -14,13 +14,6 @@ var CACHE_CONTROL_NO_CACHE_REGEXP = /(?:^|,)\s*?no-cache\s*?(?:,|$)/ -/** - * Simple expression to split token list. - * @private - */ - -var TOKEN_LIST_REGEXP = / *, */ - /** * Module exports. * @public @@ -58,9 +51,20 @@ function fresh (reqHeaders, resHeaders) { // if-none-match if (noneMatch && noneMatch !== '*') { var etag = resHeaders['etag'] - var etagStale = !etag || noneMatch.split(TOKEN_LIST_REGEXP).every(function (match) { - return match !== etag && match !== 'W/' + etag && 'W/' + match !== etag - }) + + if (!etag) { + return false + } + + var etagStale = true + var matches = parseTokenList(noneMatch) + for (var i = 0; i < matches.length; i++) { + var match = matches[i] + if (match === etag || match === 'W/' + etag || 'W/' + match === etag) { + etagStale = false + break + } + } if (etagStale) { return false @@ -70,7 +74,7 @@ function fresh (reqHeaders, resHeaders) { // if-modified-since if (modifiedSince) { var lastModified = resHeaders['last-modified'] - var modifiedStale = !lastModified || Date.parse(lastModified) > Date.parse(modifiedSince) + var modifiedStale = !lastModified || !(parseHttpDate(lastModified) <= parseHttpDate(modifiedSince)) if (modifiedStale) { return false @@ -79,3 +83,55 @@ function fresh (reqHeaders, resHeaders) { return true } + +/** + * Parse an HTTP Date into a number. + * + * @param {string} date + * @private + */ + +function parseHttpDate (date) { + var timestamp = date && Date.parse(date) + + // istanbul ignore next: guard against date.js Date.parse patching + return typeof timestamp === 'number' + ? timestamp + : NaN +} + +/** + * Parse a HTTP token list. + * + * @param {string} str + * @private + */ + +function parseTokenList (str) { + var end = 0 + var list = [] + var start = 0 + + // gather tokens + for (var i = 0, len = str.length; i < len; i++) { + switch (str.charCodeAt(i)) { + case 0x20: /* */ + if (start === end) { + start = end = i + 1 + } + break + case 0x2c: /* , */ + list.push(str.substring(start, end)) + start = end = i + 1 + break + default: + end = i + 1 + break + } + } + + // final token + list.push(str.substring(start, end)) + + return list +} diff --git a/nodejs/node_modules/fresh/package.json b/nodejs/node_modules/fresh/package.json index b767c89cc..c14e49551 100644 --- a/nodejs/node_modules/fresh/package.json +++ b/nodejs/node_modules/fresh/package.json @@ -1,51 +1,33 @@ { "_args": [ [ - { - "raw": "fresh@0.5.0", - "scope": null, - "escapedName": "fresh", - "name": "fresh", - "rawSpec": "0.5.0", - "spec": "0.5.0", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "fresh@0.5.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "fresh@0.5.0", - "_id": "fresh@0.5.0", - "_inCache": true, + "_from": "fresh@0.5.2", + "_id": "fresh@0.5.2", + "_inBundle": false, + "_integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", "_location": "/fresh", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/fresh-0.5.0.tgz_1487738798128_0.4817247486207634" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "fresh@0.5.0", - "scope": null, - "escapedName": "fresh", + "type": "version", + "registry": true, + "raw": "fresh@0.5.2", "name": "fresh", - "rawSpec": "0.5.0", - "spec": "0.5.0", - "type": "version" + "escapedName": "fresh", + "rawSpec": "0.5.2", + "saveSpec": null, + "fetchSpec": "0.5.2" }, "_requiredBy": [ "/express", "/send" ], - "_resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz", - "_shasum": "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e", - "_shrinkwrap": null, - "_spec": "fresh@0.5.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "_spec": "0.5.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca", @@ -65,21 +47,20 @@ "url": "http://jongleberry.com" } ], - "dependencies": {}, "description": "HTTP response freshness testing", "devDependencies": { - "eslint": "3.16.0", - "eslint-config-standard": "6.2.1", - "eslint-plugin-promise": "3.4.2", - "eslint-plugin-standard": "2.0.1", + "beautify-benchmark": "0.2.4", + "benchmark": "2.1.4", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", "istanbul": "0.4.5", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e", - "tarball": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -88,7 +69,6 @@ "LICENSE", "index.js" ], - "gitHead": "b1d26abb390d5dd1d9b82f0a5b890ab0ef1fee5c", "homepage": "https://github.com/jshttp/fresh#readme", "keywords": [ "fresh", @@ -97,24 +77,17 @@ "cache" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "fresh", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/fresh.git" }, "scripts": { - "lint": "eslint .", + "bench": "node benchmark/index.js", + "lint": "eslint --plugin markdown --ext js,md .", "test": "mocha --reporter spec --bail --check-leaks test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/", "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/" }, - "version": "0.5.0" + "version": "0.5.2" } diff --git a/nodejs/node_modules/has-ansi/package.json b/nodejs/node_modules/has-ansi/package.json index d9021e2a8..3dbd2d596 100644 --- a/nodejs/node_modules/has-ansi/package.json +++ b/nodejs/node_modules/has-ansi/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "has-ansi@^0.1.0", - "scope": null, - "escapedName": "has-ansi", - "name": "has-ansi", - "rawSpec": "^0.1.0", - "spec": ">=0.1.0 <0.2.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk" + "has-ansi@0.1.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "has-ansi@>=0.1.0 <0.2.0", + "_from": "has-ansi@0.1.0", "_id": "has-ansi@0.1.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", "_location": "/has-ansi", - "_npmUser": { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - }, - "_npmVersion": "1.4.9", "_phantomChildren": {}, "_requested": { - "raw": "has-ansi@^0.1.0", - "scope": null, - "escapedName": "has-ansi", + "type": "version", + "registry": true, + "raw": "has-ansi@0.1.0", "name": "has-ansi", - "rawSpec": "^0.1.0", - "spec": ">=0.1.0 <0.2.0", - "type": "range" + "escapedName": "has-ansi", + "rawSpec": "0.1.0", + "saveSpec": null, + "fetchSpec": "0.1.0" }, "_requiredBy": [ "/chalk" ], "_resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "_shasum": "84f265aae8c0e6a88a12d7022894b7568894c62e", - "_shrinkwrap": null, - "_spec": "has-ansi@^0.1.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk", + "_spec": "0.1.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -58,11 +45,6 @@ "devDependencies": { "mocha": "*" }, - "directories": {}, - "dist": { - "shasum": "84f265aae8c0e6a88a12d7022894b7568894c62e", - "tarball": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz" - }, "engines": { "node": ">=0.10.0" }, @@ -70,7 +52,7 @@ "index.js", "cli.js" ], - "homepage": "https://github.com/sindresorhus/has-ansi", + "homepage": "https://github.com/sindresorhus/has-ansi#readme", "keywords": [ "cli", "bin", @@ -98,18 +80,10 @@ "has" ], "license": "MIT", - "maintainers": [ - { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - } - ], "name": "has-ansi", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", - "url": "git://github.com/sindresorhus/has-ansi.git" + "url": "git+https://github.com/sindresorhus/has-ansi.git" }, "scripts": { "test": "mocha" diff --git a/nodejs/node_modules/http-errors/HISTORY.md b/nodejs/node_modules/http-errors/HISTORY.md index 94b6b29a9..b6ee4a0ae 100644 --- a/nodejs/node_modules/http-errors/HISTORY.md +++ b/nodejs/node_modules/http-errors/HISTORY.md @@ -1,3 +1,9 @@ +2017-08-04 / 1.6.2 +================== + + * deps: depd@1.1.1 + - Remove unnecessary `Buffer` loading + 2017-02-20 / 1.6.1 ================== diff --git a/nodejs/node_modules/http-errors/node_modules/setprototypeof/LICENSE b/nodejs/node_modules/http-errors/node_modules/setprototypeof/LICENSE new file mode 100644 index 000000000..61afa2f18 --- /dev/null +++ b/nodejs/node_modules/http-errors/node_modules/setprototypeof/LICENSE @@ -0,0 +1,13 @@ +Copyright (c) 2015, Wes Todd + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/nodejs/node_modules/http-errors/node_modules/setprototypeof/README.md b/nodejs/node_modules/http-errors/node_modules/setprototypeof/README.md new file mode 100644 index 000000000..01d794705 --- /dev/null +++ b/nodejs/node_modules/http-errors/node_modules/setprototypeof/README.md @@ -0,0 +1,21 @@ +# Polyfill for `Object.setPrototypeOf` + +A simple cross platform implementation to set the prototype of an instianted object. Supports all modern browsers and at least back to IE8. + +## Usage: + +``` +$ npm install --save setprototypeof +``` + +```javascript +var setPrototypeOf = require('setprototypeof'); + +var obj = {}; +setPrototypeOf(obj, { + foo: function() { + return 'bar'; + } +}); +obj.foo(); // bar +``` diff --git a/nodejs/node_modules/http-errors/node_modules/setprototypeof/index.js b/nodejs/node_modules/http-errors/node_modules/setprototypeof/index.js new file mode 100644 index 000000000..93ea4176c --- /dev/null +++ b/nodejs/node_modules/http-errors/node_modules/setprototypeof/index.js @@ -0,0 +1,15 @@ +module.exports = Object.setPrototypeOf || ({__proto__:[]} instanceof Array ? setProtoOf : mixinProperties); + +function setProtoOf(obj, proto) { + obj.__proto__ = proto; + return obj; +} + +function mixinProperties(obj, proto) { + for (var prop in proto) { + if (!obj.hasOwnProperty(prop)) { + obj[prop] = proto[prop]; + } + } + return obj; +} diff --git a/nodejs/node_modules/http-errors/node_modules/setprototypeof/package.json b/nodejs/node_modules/http-errors/node_modules/setprototypeof/package.json new file mode 100644 index 000000000..3e1885aed --- /dev/null +++ b/nodejs/node_modules/http-errors/node_modules/setprototypeof/package.json @@ -0,0 +1,54 @@ +{ + "_args": [ + [ + "setprototypeof@1.0.3", + "/Users/muammar/github/mkchromecast/nodejs" + ] + ], + "_from": "setprototypeof@1.0.3", + "_id": "setprototypeof@1.0.3", + "_inBundle": false, + "_integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "_location": "/http-errors/setprototypeof", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "setprototypeof@1.0.3", + "name": "setprototypeof", + "escapedName": "setprototypeof", + "rawSpec": "1.0.3", + "saveSpec": null, + "fetchSpec": "1.0.3" + }, + "_requiredBy": [ + "/http-errors" + ], + "_resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "_spec": "1.0.3", + "_where": "/Users/muammar/github/mkchromecast/nodejs", + "author": { + "name": "Wes Todd" + }, + "bugs": { + "url": "https://github.com/wesleytodd/setprototypeof/issues" + }, + "description": "A small polyfill for Object.setprototypeof", + "homepage": "https://github.com/wesleytodd/setprototypeof", + "keywords": [ + "polyfill", + "object", + "setprototypeof" + ], + "license": "ISC", + "main": "index.js", + "name": "setprototypeof", + "repository": { + "type": "git", + "url": "git+https://github.com/wesleytodd/setprototypeof.git" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "version": "1.0.3" +} diff --git a/nodejs/node_modules/http-errors/package.json b/nodejs/node_modules/http-errors/package.json index b0e819242..2a724c30a 100644 --- a/nodejs/node_modules/http-errors/package.json +++ b/nodejs/node_modules/http-errors/package.json @@ -1,50 +1,34 @@ { "_args": [ [ - { - "raw": "http-errors@~1.6.1", - "scope": null, - "escapedName": "http-errors", - "name": "http-errors", - "rawSpec": "~1.6.1", - "spec": ">=1.6.1 <1.7.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/send" + "http-errors@1.6.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "http-errors@>=1.6.1 <1.7.0", - "_id": "http-errors@1.6.1", - "_inCache": true, + "_from": "http-errors@1.6.2", + "_id": "http-errors@1.6.2", + "_inBundle": false, + "_integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", "_location": "/http-errors", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/http-errors-1.6.1.tgz_1487647400122_0.1305304525885731" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "http-errors@~1.6.1", - "scope": null, - "escapedName": "http-errors", + "type": "version", + "registry": true, + "raw": "http-errors@1.6.2", "name": "http-errors", - "rawSpec": "~1.6.1", - "spec": ">=1.6.1 <1.7.0", - "type": "range" + "escapedName": "http-errors", + "rawSpec": "1.6.2", + "saveSpec": null, + "fetchSpec": "1.6.2" }, "_requiredBy": [ + "/body-parser", + "/raw-body", "/send" ], - "_resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz", - "_shasum": "5f8b8ed98aca545656bf572997387f904a722257", - "_shrinkwrap": null, - "_spec": "http-errors@~1.6.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/send", + "_resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "_spec": "1.6.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Jonathan Ong", "email": "me@jongleberry.com", @@ -64,26 +48,23 @@ } ], "dependencies": { - "depd": "1.1.0", + "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", "statuses": ">= 1.3.1 < 2" }, "description": "Create HTTP error objects", "devDependencies": { - "eslint": "3.16.0", - "eslint-config-standard": "6.2.1", - "eslint-plugin-markdown": "1.0.0-beta.3", - "eslint-plugin-promise": "3.4.2", - "eslint-plugin-standard": "2.0.1", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", "istanbul": "0.4.5", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "5f8b8ed98aca545656bf572997387f904a722257", - "tarball": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -93,30 +74,13 @@ "LICENSE", "README.md" ], - "gitHead": "d8d95dbc84c913a594b7fca07096697412af7edd", "homepage": "https://github.com/jshttp/http-errors#readme", "keywords": [ "http", "error" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "egeste", - "email": "npm@egeste.net" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - } - ], "name": "http-errors", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/http-errors.git" @@ -127,5 +91,5 @@ "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot", "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter dot" }, - "version": "1.6.1" + "version": "1.6.2" } diff --git a/nodejs/node_modules/iconv-lite/.npmignore b/nodejs/node_modules/iconv-lite/.npmignore new file mode 100644 index 000000000..5cd2673c9 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/.npmignore @@ -0,0 +1,6 @@ +*~ +*sublime-* +generation +test +wiki +coverage diff --git a/nodejs/node_modules/iconv-lite/.travis.yml b/nodejs/node_modules/iconv-lite/.travis.yml new file mode 100644 index 000000000..3eab7fdb3 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/.travis.yml @@ -0,0 +1,23 @@ + sudo: false + language: node_js + node_js: + - "0.10" + - "0.11" + - "0.12" + - "iojs" + - "4" + - "6" + - "8" + - "node" + + + env: + - CXX=g++-4.8 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.8 + - g++-4.8 + diff --git a/nodejs/node_modules/iconv-lite/Changelog.md b/nodejs/node_modules/iconv-lite/Changelog.md new file mode 100644 index 000000000..64aae34b1 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/Changelog.md @@ -0,0 +1,134 @@ + +# 0.4.19 / 2017-09-09 + + * Fixed iso8859-1 codec regression in handling untranslatable characters (#162, caused by #147) + * Re-generated windows1255 codec, because it was updated in iconv project + * Fixed grammar in error message when iconv-lite is loaded with encoding other than utf8 + + +# 0.4.18 / 2017-06-13 + + * Fixed CESU-8 regression in Node v8. + + +# 0.4.17 / 2017-04-22 + + * Updated typescript definition file to support Angular 2 AoT mode (#153 by @larssn) + + +# 0.4.16 / 2017-04-22 + + * Added support for React Native (#150) + * Changed iso8859-1 encoding to usine internal 'binary' encoding, as it's the same thing (#147 by @mscdex) + * Fixed typo in Readme (#138 by @jiangzhuo) + * Fixed build for Node v6.10+ by making correct version comparison + * Added a warning if iconv-lite is loaded not as utf-8 (see #142) + + +# 0.4.15 / 2016-11-21 + + * Fixed typescript type definition (#137) + + +# 0.4.14 / 2016-11-20 + + * Preparation for v1.0 + * Added Node v6 and latest Node versions to Travis CI test rig + * Deprecated Node v0.8 support + * Typescript typings (@larssn) + * Fix encoding of Euro character in GB 18030 (inspired by @lygstate) + * Add ms prefix to dbcs windows encodings (@rokoroku) + + +# 0.4.13 / 2015-10-01 + + * Fix silly mistake in deprecation notice. + + +# 0.4.12 / 2015-09-26 + + * Node v4 support: + * Added CESU-8 decoding (#106) + * Added deprecation notice for `extendNodeEncodings` + * Added Travis tests for Node v4 and io.js latest (#105 by @Mithgol) + + +# 0.4.11 / 2015-07-03 + + * Added CESU-8 encoding. + + +# 0.4.10 / 2015-05-26 + + * Changed UTF-16 endianness heuristic to take into account any ASCII chars, not + just spaces. This should minimize the importance of "default" endianness. + + +# 0.4.9 / 2015-05-24 + + * Streamlined BOM handling: strip BOM by default, add BOM when encoding if + addBOM: true. Added docs to Readme. + * UTF16 now uses UTF16-LE by default. + * Fixed minor issue with big5 encoding. + * Added io.js testing on Travis; updated node-iconv version to test against. + Now we just skip testing SBCS encodings that node-iconv doesn't support. + * (internal refactoring) Updated codec interface to use classes. + * Use strict mode in all files. + + +# 0.4.8 / 2015-04-14 + + * added alias UNICODE-1-1-UTF-7 for UTF-7 encoding (#94) + + +# 0.4.7 / 2015-02-05 + + * stop official support of Node.js v0.8. Should still work, but no guarantees. + reason: Packages needed for testing are hard to get on Travis CI. + * work in environment where Object.prototype is monkey patched with enumerable + props (#89). + + +# 0.4.6 / 2015-01-12 + + * fix rare aliases of single-byte encodings (thanks @mscdex) + * double the timeout for dbcs tests to make them less flaky on travis + + +# 0.4.5 / 2014-11-20 + + * fix windows-31j and x-sjis encoding support (@nleush) + * minor fix: undefined variable reference when internal error happens + + +# 0.4.4 / 2014-07-16 + + * added encodings UTF-7 (RFC2152) and UTF-7-IMAP (RFC3501 Section 5.1.3) + * fixed streaming base64 encoding + + +# 0.4.3 / 2014-06-14 + + * added encodings UTF-16BE and UTF-16 with BOM + + +# 0.4.2 / 2014-06-12 + + * don't throw exception if `extendNodeEncodings()` is called more than once + + +# 0.4.1 / 2014-06-11 + + * codepage 808 added + + +# 0.4.0 / 2014-06-10 + + * code is rewritten from scratch + * all widespread encodings are supported + * streaming interface added + * browserify compatibility added + * (optional) extend core primitive encodings to make usage even simpler + * moved from vows to mocha as the testing framework + + diff --git a/nodejs/node_modules/iconv-lite/LICENSE b/nodejs/node_modules/iconv-lite/LICENSE new file mode 100644 index 000000000..d518d8376 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/LICENSE @@ -0,0 +1,21 @@ +Copyright (c) 2011 Alexander Shtuchkin + +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/nodejs/node_modules/iconv-lite/README.md b/nodejs/node_modules/iconv-lite/README.md new file mode 100644 index 000000000..767daedef --- /dev/null +++ b/nodejs/node_modules/iconv-lite/README.md @@ -0,0 +1,160 @@ +## Pure JS character encoding conversion [![Build Status](https://travis-ci.org/ashtuchkin/iconv-lite.svg?branch=master)](https://travis-ci.org/ashtuchkin/iconv-lite) + + * Doesn't need native code compilation. Works on Windows and in sandboxed environments like [Cloud9](http://c9.io). + * Used in popular projects like [Express.js (body_parser)](https://github.com/expressjs/body-parser), + [Grunt](http://gruntjs.com/), [Nodemailer](http://www.nodemailer.com/), [Yeoman](http://yeoman.io/) and others. + * Faster than [node-iconv](https://github.com/bnoordhuis/node-iconv) (see below for performance comparison). + * Intuitive encode/decode API + * Streaming support for Node v0.10+ + * [Deprecated] Can extend Node.js primitives (buffers, streams) to support all iconv-lite encodings. + * In-browser usage via [Browserify](https://github.com/substack/node-browserify) (~180k gzip compressed with Buffer shim included). + * Typescript [type definition file](https://github.com/ashtuchkin/iconv-lite/blob/master/lib/index.d.ts) included. + * React Native is supported (need to explicitly `npm install` two more modules: `buffer` and `stream`). + * License: MIT. + +[![NPM Stats](https://nodei.co/npm/iconv-lite.png?downloads=true&downloadRank=true)](https://npmjs.org/packages/iconv-lite/) + +## Usage +### Basic API +```javascript +var iconv = require('iconv-lite'); + +// Convert from an encoded buffer to js string. +str = iconv.decode(new Buffer([0x68, 0x65, 0x6c, 0x6c, 0x6f]), 'win1251'); + +// Convert from js string to an encoded buffer. +buf = iconv.encode("Sample input string", 'win1251'); + +// Check if encoding is supported +iconv.encodingExists("us-ascii") +``` + +### Streaming API (Node v0.10+) +```javascript + +// Decode stream (from binary stream to js strings) +http.createServer(function(req, res) { + var converterStream = iconv.decodeStream('win1251'); + req.pipe(converterStream); + + converterStream.on('data', function(str) { + console.log(str); // Do something with decoded strings, chunk-by-chunk. + }); +}); + +// Convert encoding streaming example +fs.createReadStream('file-in-win1251.txt') + .pipe(iconv.decodeStream('win1251')) + .pipe(iconv.encodeStream('ucs2')) + .pipe(fs.createWriteStream('file-in-ucs2.txt')); + +// Sugar: all encode/decode streams have .collect(cb) method to accumulate data. +http.createServer(function(req, res) { + req.pipe(iconv.decodeStream('win1251')).collect(function(err, body) { + assert(typeof body == 'string'); + console.log(body); // full request body string + }); +}); +``` + +### [Deprecated] Extend Node.js own encodings +> NOTE: This doesn't work on latest Node versions. See [details](https://github.com/ashtuchkin/iconv-lite/wiki/Node-v4-compatibility). + +```javascript +// After this call all Node basic primitives will understand iconv-lite encodings. +iconv.extendNodeEncodings(); + +// Examples: +buf = new Buffer(str, 'win1251'); +buf.write(str, 'gbk'); +str = buf.toString('latin1'); +assert(Buffer.isEncoding('iso-8859-15')); +Buffer.byteLength(str, 'us-ascii'); + +http.createServer(function(req, res) { + req.setEncoding('big5'); + req.collect(function(err, body) { + console.log(body); + }); +}); + +fs.createReadStream("file.txt", "shift_jis"); + +// External modules are also supported (if they use Node primitives, which they probably do). +request = require('request'); +request({ + url: "http://github.com/", + encoding: "cp932" +}); + +// To remove extensions +iconv.undoExtendNodeEncodings(); +``` + +## Supported encodings + + * All node.js native encodings: utf8, ucs2 / utf16-le, ascii, binary, base64, hex. + * Additional unicode encodings: utf16, utf16-be, utf-7, utf-7-imap. + * All widespread singlebyte encodings: Windows 125x family, ISO-8859 family, + IBM/DOS codepages, Macintosh family, KOI8 family, all others supported by iconv library. + Aliases like 'latin1', 'us-ascii' also supported. + * All widespread multibyte encodings: CP932, CP936, CP949, CP950, GB2312, GBK, GB18030, Big5, Shift_JIS, EUC-JP. + +See [all supported encodings on wiki](https://github.com/ashtuchkin/iconv-lite/wiki/Supported-Encodings). + +Most singlebyte encodings are generated automatically from [node-iconv](https://github.com/bnoordhuis/node-iconv). Thank you Ben Noordhuis and libiconv authors! + +Multibyte encodings are generated from [Unicode.org mappings](http://www.unicode.org/Public/MAPPINGS/) and [WHATWG Encoding Standard mappings](http://encoding.spec.whatwg.org/). Thank you, respective authors! + + +## Encoding/decoding speed + +Comparison with node-iconv module (1000x256kb, on MacBook Pro, Core i5/2.6 GHz, Node v0.12.0). +Note: your results may vary, so please always check on your hardware. + + operation iconv@2.1.4 iconv-lite@0.4.7 + ---------------------------------------------------------- + encode('win1251') ~96 Mb/s ~320 Mb/s + decode('win1251') ~95 Mb/s ~246 Mb/s + +## BOM handling + + * Decoding: BOM is stripped by default, unless overridden by passing `stripBOM: false` in options + (f.ex. `iconv.decode(buf, enc, {stripBOM: false})`). + A callback might also be given as a `stripBOM` parameter - it'll be called if BOM character was actually found. + * If you want to detect UTF-8 BOM when decoding other encodings, use [node-autodetect-decoder-stream](https://github.com/danielgindi/node-autodetect-decoder-stream) module. + * Encoding: No BOM added, unless overridden by `addBOM: true` option. + +## UTF-16 Encodings + +This library supports UTF-16LE, UTF-16BE and UTF-16 encodings. First two are straightforward, but UTF-16 is trying to be +smart about endianness in the following ways: + * Decoding: uses BOM and 'spaces heuristic' to determine input endianness. Default is UTF-16LE, but can be + overridden with `defaultEncoding: 'utf-16be'` option. Strips BOM unless `stripBOM: false`. + * Encoding: uses UTF-16LE and writes BOM by default. Use `addBOM: false` to override. + +## Other notes + +When decoding, be sure to supply a Buffer to decode() method, otherwise [bad things usually happen](https://github.com/ashtuchkin/iconv-lite/wiki/Use-Buffers-when-decoding). +Untranslatable characters are set to � or ?. No transliteration is currently supported. +Node versions 0.10.31 and 0.11.13 are buggy, don't use them (see #65, #77). + +## Testing + +```bash +$ git clone git@github.com:ashtuchkin/iconv-lite.git +$ cd iconv-lite +$ npm install +$ npm test + +$ # To view performance: +$ node test/performance.js + +$ # To view test coverage: +$ npm run coverage +$ open coverage/lcov-report/index.html +``` + +## Adoption +[![NPM](https://nodei.co/npm-dl/iconv-lite.png)](https://nodei.co/npm/iconv-lite/) +[![Codeship Status for ashtuchkin/iconv-lite](https://www.codeship.com/projects/81670840-fa72-0131-4520-4a01a6c01acc/status)](https://www.codeship.com/projects/29053) diff --git a/nodejs/node_modules/iconv-lite/encodings/dbcs-codec.js b/nodejs/node_modules/iconv-lite/encodings/dbcs-codec.js new file mode 100644 index 000000000..7b3c980b3 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/dbcs-codec.js @@ -0,0 +1,555 @@ +"use strict"; +var Buffer = require("buffer").Buffer; + +// Multibyte codec. In this scheme, a character is represented by 1 or more bytes. +// Our codec supports UTF-16 surrogates, extensions for GB18030 and unicode sequences. +// To save memory and loading time, we read table files only when requested. + +exports._dbcs = DBCSCodec; + +var UNASSIGNED = -1, + GB18030_CODE = -2, + SEQ_START = -10, + NODE_START = -1000, + UNASSIGNED_NODE = new Array(0x100), + DEF_CHAR = -1; + +for (var i = 0; i < 0x100; i++) + UNASSIGNED_NODE[i] = UNASSIGNED; + + +// Class DBCSCodec reads and initializes mapping tables. +function DBCSCodec(codecOptions, iconv) { + this.encodingName = codecOptions.encodingName; + if (!codecOptions) + throw new Error("DBCS codec is called without the data.") + if (!codecOptions.table) + throw new Error("Encoding '" + this.encodingName + "' has no data."); + + // Load tables. + var mappingTable = codecOptions.table(); + + + // Decode tables: MBCS -> Unicode. + + // decodeTables is a trie, encoded as an array of arrays of integers. Internal arrays are trie nodes and all have len = 256. + // Trie root is decodeTables[0]. + // Values: >= 0 -> unicode character code. can be > 0xFFFF + // == UNASSIGNED -> unknown/unassigned sequence. + // == GB18030_CODE -> this is the end of a GB18030 4-byte sequence. + // <= NODE_START -> index of the next node in our trie to process next byte. + // <= SEQ_START -> index of the start of a character code sequence, in decodeTableSeq. + this.decodeTables = []; + this.decodeTables[0] = UNASSIGNED_NODE.slice(0); // Create root node. + + // Sometimes a MBCS char corresponds to a sequence of unicode chars. We store them as arrays of integers here. + this.decodeTableSeq = []; + + // Actual mapping tables consist of chunks. Use them to fill up decode tables. + for (var i = 0; i < mappingTable.length; i++) + this._addDecodeChunk(mappingTable[i]); + + this.defaultCharUnicode = iconv.defaultCharUnicode; + + + // Encode tables: Unicode -> DBCS. + + // `encodeTable` is array mapping from unicode char to encoded char. All its values are integers for performance. + // Because it can be sparse, it is represented as array of buckets by 256 chars each. Bucket can be null. + // Values: >= 0 -> it is a normal char. Write the value (if <=256 then 1 byte, if <=65536 then 2 bytes, etc.). + // == UNASSIGNED -> no conversion found. Output a default char. + // <= SEQ_START -> it's an index in encodeTableSeq, see below. The character starts a sequence. + this.encodeTable = []; + + // `encodeTableSeq` is used when a sequence of unicode characters is encoded as a single code. We use a tree of + // objects where keys correspond to characters in sequence and leafs are the encoded dbcs values. A special DEF_CHAR key + // means end of sequence (needed when one sequence is a strict subsequence of another). + // Objects are kept separately from encodeTable to increase performance. + this.encodeTableSeq = []; + + // Some chars can be decoded, but need not be encoded. + var skipEncodeChars = {}; + if (codecOptions.encodeSkipVals) + for (var i = 0; i < codecOptions.encodeSkipVals.length; i++) { + var val = codecOptions.encodeSkipVals[i]; + if (typeof val === 'number') + skipEncodeChars[val] = true; + else + for (var j = val.from; j <= val.to; j++) + skipEncodeChars[j] = true; + } + + // Use decode trie to recursively fill out encode tables. + this._fillEncodeTable(0, 0, skipEncodeChars); + + // Add more encoding pairs when needed. + if (codecOptions.encodeAdd) { + for (var uChar in codecOptions.encodeAdd) + if (Object.prototype.hasOwnProperty.call(codecOptions.encodeAdd, uChar)) + this._setEncodeChar(uChar.charCodeAt(0), codecOptions.encodeAdd[uChar]); + } + + this.defCharSB = this.encodeTable[0][iconv.defaultCharSingleByte.charCodeAt(0)]; + if (this.defCharSB === UNASSIGNED) this.defCharSB = this.encodeTable[0]['?']; + if (this.defCharSB === UNASSIGNED) this.defCharSB = "?".charCodeAt(0); + + + // Load & create GB18030 tables when needed. + if (typeof codecOptions.gb18030 === 'function') { + this.gb18030 = codecOptions.gb18030(); // Load GB18030 ranges. + + // Add GB18030 decode tables. + var thirdByteNodeIdx = this.decodeTables.length; + var thirdByteNode = this.decodeTables[thirdByteNodeIdx] = UNASSIGNED_NODE.slice(0); + + var fourthByteNodeIdx = this.decodeTables.length; + var fourthByteNode = this.decodeTables[fourthByteNodeIdx] = UNASSIGNED_NODE.slice(0); + + for (var i = 0x81; i <= 0xFE; i++) { + var secondByteNodeIdx = NODE_START - this.decodeTables[0][i]; + var secondByteNode = this.decodeTables[secondByteNodeIdx]; + for (var j = 0x30; j <= 0x39; j++) + secondByteNode[j] = NODE_START - thirdByteNodeIdx; + } + for (var i = 0x81; i <= 0xFE; i++) + thirdByteNode[i] = NODE_START - fourthByteNodeIdx; + for (var i = 0x30; i <= 0x39; i++) + fourthByteNode[i] = GB18030_CODE + } +} + +DBCSCodec.prototype.encoder = DBCSEncoder; +DBCSCodec.prototype.decoder = DBCSDecoder; + +// Decoder helpers +DBCSCodec.prototype._getDecodeTrieNode = function(addr) { + var bytes = []; + for (; addr > 0; addr >>= 8) + bytes.push(addr & 0xFF); + if (bytes.length == 0) + bytes.push(0); + + var node = this.decodeTables[0]; + for (var i = bytes.length-1; i > 0; i--) { // Traverse nodes deeper into the trie. + var val = node[bytes[i]]; + + if (val == UNASSIGNED) { // Create new node. + node[bytes[i]] = NODE_START - this.decodeTables.length; + this.decodeTables.push(node = UNASSIGNED_NODE.slice(0)); + } + else if (val <= NODE_START) { // Existing node. + node = this.decodeTables[NODE_START - val]; + } + else + throw new Error("Overwrite byte in " + this.encodingName + ", addr: " + addr.toString(16)); + } + return node; +} + + +DBCSCodec.prototype._addDecodeChunk = function(chunk) { + // First element of chunk is the hex mbcs code where we start. + var curAddr = parseInt(chunk[0], 16); + + // Choose the decoding node where we'll write our chars. + var writeTable = this._getDecodeTrieNode(curAddr); + curAddr = curAddr & 0xFF; + + // Write all other elements of the chunk to the table. + for (var k = 1; k < chunk.length; k++) { + var part = chunk[k]; + if (typeof part === "string") { // String, write as-is. + for (var l = 0; l < part.length;) { + var code = part.charCodeAt(l++); + if (0xD800 <= code && code < 0xDC00) { // Decode surrogate + var codeTrail = part.charCodeAt(l++); + if (0xDC00 <= codeTrail && codeTrail < 0xE000) + writeTable[curAddr++] = 0x10000 + (code - 0xD800) * 0x400 + (codeTrail - 0xDC00); + else + throw new Error("Incorrect surrogate pair in " + this.encodingName + " at chunk " + chunk[0]); + } + else if (0x0FF0 < code && code <= 0x0FFF) { // Character sequence (our own encoding used) + var len = 0xFFF - code + 2; + var seq = []; + for (var m = 0; m < len; m++) + seq.push(part.charCodeAt(l++)); // Simple variation: don't support surrogates or subsequences in seq. + + writeTable[curAddr++] = SEQ_START - this.decodeTableSeq.length; + this.decodeTableSeq.push(seq); + } + else + writeTable[curAddr++] = code; // Basic char + } + } + else if (typeof part === "number") { // Integer, meaning increasing sequence starting with prev character. + var charCode = writeTable[curAddr - 1] + 1; + for (var l = 0; l < part; l++) + writeTable[curAddr++] = charCode++; + } + else + throw new Error("Incorrect type '" + typeof part + "' given in " + this.encodingName + " at chunk " + chunk[0]); + } + if (curAddr > 0xFF) + throw new Error("Incorrect chunk in " + this.encodingName + " at addr " + chunk[0] + ": too long" + curAddr); +} + +// Encoder helpers +DBCSCodec.prototype._getEncodeBucket = function(uCode) { + var high = uCode >> 8; // This could be > 0xFF because of astral characters. + if (this.encodeTable[high] === undefined) + this.encodeTable[high] = UNASSIGNED_NODE.slice(0); // Create bucket on demand. + return this.encodeTable[high]; +} + +DBCSCodec.prototype._setEncodeChar = function(uCode, dbcsCode) { + var bucket = this._getEncodeBucket(uCode); + var low = uCode & 0xFF; + if (bucket[low] <= SEQ_START) + this.encodeTableSeq[SEQ_START-bucket[low]][DEF_CHAR] = dbcsCode; // There's already a sequence, set a single-char subsequence of it. + else if (bucket[low] == UNASSIGNED) + bucket[low] = dbcsCode; +} + +DBCSCodec.prototype._setEncodeSequence = function(seq, dbcsCode) { + + // Get the root of character tree according to first character of the sequence. + var uCode = seq[0]; + var bucket = this._getEncodeBucket(uCode); + var low = uCode & 0xFF; + + var node; + if (bucket[low] <= SEQ_START) { + // There's already a sequence with - use it. + node = this.encodeTableSeq[SEQ_START-bucket[low]]; + } + else { + // There was no sequence object - allocate a new one. + node = {}; + if (bucket[low] !== UNASSIGNED) node[DEF_CHAR] = bucket[low]; // If a char was set before - make it a single-char subsequence. + bucket[low] = SEQ_START - this.encodeTableSeq.length; + this.encodeTableSeq.push(node); + } + + // Traverse the character tree, allocating new nodes as needed. + for (var j = 1; j < seq.length-1; j++) { + var oldVal = node[uCode]; + if (typeof oldVal === 'object') + node = oldVal; + else { + node = node[uCode] = {} + if (oldVal !== undefined) + node[DEF_CHAR] = oldVal + } + } + + // Set the leaf to given dbcsCode. + uCode = seq[seq.length-1]; + node[uCode] = dbcsCode; +} + +DBCSCodec.prototype._fillEncodeTable = function(nodeIdx, prefix, skipEncodeChars) { + var node = this.decodeTables[nodeIdx]; + for (var i = 0; i < 0x100; i++) { + var uCode = node[i]; + var mbCode = prefix + i; + if (skipEncodeChars[mbCode]) + continue; + + if (uCode >= 0) + this._setEncodeChar(uCode, mbCode); + else if (uCode <= NODE_START) + this._fillEncodeTable(NODE_START - uCode, mbCode << 8, skipEncodeChars); + else if (uCode <= SEQ_START) + this._setEncodeSequence(this.decodeTableSeq[SEQ_START - uCode], mbCode); + } +} + + + +// == Encoder ================================================================== + +function DBCSEncoder(options, codec) { + // Encoder state + this.leadSurrogate = -1; + this.seqObj = undefined; + + // Static data + this.encodeTable = codec.encodeTable; + this.encodeTableSeq = codec.encodeTableSeq; + this.defaultCharSingleByte = codec.defCharSB; + this.gb18030 = codec.gb18030; +} + +DBCSEncoder.prototype.write = function(str) { + var newBuf = new Buffer(str.length * (this.gb18030 ? 4 : 3)), + leadSurrogate = this.leadSurrogate, + seqObj = this.seqObj, nextChar = -1, + i = 0, j = 0; + + while (true) { + // 0. Get next character. + if (nextChar === -1) { + if (i == str.length) break; + var uCode = str.charCodeAt(i++); + } + else { + var uCode = nextChar; + nextChar = -1; + } + + // 1. Handle surrogates. + if (0xD800 <= uCode && uCode < 0xE000) { // Char is one of surrogates. + if (uCode < 0xDC00) { // We've got lead surrogate. + if (leadSurrogate === -1) { + leadSurrogate = uCode; + continue; + } else { + leadSurrogate = uCode; + // Double lead surrogate found. + uCode = UNASSIGNED; + } + } else { // We've got trail surrogate. + if (leadSurrogate !== -1) { + uCode = 0x10000 + (leadSurrogate - 0xD800) * 0x400 + (uCode - 0xDC00); + leadSurrogate = -1; + } else { + // Incomplete surrogate pair - only trail surrogate found. + uCode = UNASSIGNED; + } + + } + } + else if (leadSurrogate !== -1) { + // Incomplete surrogate pair - only lead surrogate found. + nextChar = uCode; uCode = UNASSIGNED; // Write an error, then current char. + leadSurrogate = -1; + } + + // 2. Convert uCode character. + var dbcsCode = UNASSIGNED; + if (seqObj !== undefined && uCode != UNASSIGNED) { // We are in the middle of the sequence + var resCode = seqObj[uCode]; + if (typeof resCode === 'object') { // Sequence continues. + seqObj = resCode; + continue; + + } else if (typeof resCode == 'number') { // Sequence finished. Write it. + dbcsCode = resCode; + + } else if (resCode == undefined) { // Current character is not part of the sequence. + + // Try default character for this sequence + resCode = seqObj[DEF_CHAR]; + if (resCode !== undefined) { + dbcsCode = resCode; // Found. Write it. + nextChar = uCode; // Current character will be written too in the next iteration. + + } else { + // TODO: What if we have no default? (resCode == undefined) + // Then, we should write first char of the sequence as-is and try the rest recursively. + // Didn't do it for now because no encoding has this situation yet. + // Currently, just skip the sequence and write current char. + } + } + seqObj = undefined; + } + else if (uCode >= 0) { // Regular character + var subtable = this.encodeTable[uCode >> 8]; + if (subtable !== undefined) + dbcsCode = subtable[uCode & 0xFF]; + + if (dbcsCode <= SEQ_START) { // Sequence start + seqObj = this.encodeTableSeq[SEQ_START-dbcsCode]; + continue; + } + + if (dbcsCode == UNASSIGNED && this.gb18030) { + // Use GB18030 algorithm to find character(s) to write. + var idx = findIdx(this.gb18030.uChars, uCode); + if (idx != -1) { + var dbcsCode = this.gb18030.gbChars[idx] + (uCode - this.gb18030.uChars[idx]); + newBuf[j++] = 0x81 + Math.floor(dbcsCode / 12600); dbcsCode = dbcsCode % 12600; + newBuf[j++] = 0x30 + Math.floor(dbcsCode / 1260); dbcsCode = dbcsCode % 1260; + newBuf[j++] = 0x81 + Math.floor(dbcsCode / 10); dbcsCode = dbcsCode % 10; + newBuf[j++] = 0x30 + dbcsCode; + continue; + } + } + } + + // 3. Write dbcsCode character. + if (dbcsCode === UNASSIGNED) + dbcsCode = this.defaultCharSingleByte; + + if (dbcsCode < 0x100) { + newBuf[j++] = dbcsCode; + } + else if (dbcsCode < 0x10000) { + newBuf[j++] = dbcsCode >> 8; // high byte + newBuf[j++] = dbcsCode & 0xFF; // low byte + } + else { + newBuf[j++] = dbcsCode >> 16; + newBuf[j++] = (dbcsCode >> 8) & 0xFF; + newBuf[j++] = dbcsCode & 0xFF; + } + } + + this.seqObj = seqObj; + this.leadSurrogate = leadSurrogate; + return newBuf.slice(0, j); +} + +DBCSEncoder.prototype.end = function() { + if (this.leadSurrogate === -1 && this.seqObj === undefined) + return; // All clean. Most often case. + + var newBuf = new Buffer(10), j = 0; + + if (this.seqObj) { // We're in the sequence. + var dbcsCode = this.seqObj[DEF_CHAR]; + if (dbcsCode !== undefined) { // Write beginning of the sequence. + if (dbcsCode < 0x100) { + newBuf[j++] = dbcsCode; + } + else { + newBuf[j++] = dbcsCode >> 8; // high byte + newBuf[j++] = dbcsCode & 0xFF; // low byte + } + } else { + // See todo above. + } + this.seqObj = undefined; + } + + if (this.leadSurrogate !== -1) { + // Incomplete surrogate pair - only lead surrogate found. + newBuf[j++] = this.defaultCharSingleByte; + this.leadSurrogate = -1; + } + + return newBuf.slice(0, j); +} + +// Export for testing +DBCSEncoder.prototype.findIdx = findIdx; + + +// == Decoder ================================================================== + +function DBCSDecoder(options, codec) { + // Decoder state + this.nodeIdx = 0; + this.prevBuf = new Buffer(0); + + // Static data + this.decodeTables = codec.decodeTables; + this.decodeTableSeq = codec.decodeTableSeq; + this.defaultCharUnicode = codec.defaultCharUnicode; + this.gb18030 = codec.gb18030; +} + +DBCSDecoder.prototype.write = function(buf) { + var newBuf = new Buffer(buf.length*2), + nodeIdx = this.nodeIdx, + prevBuf = this.prevBuf, prevBufOffset = this.prevBuf.length, + seqStart = -this.prevBuf.length, // idx of the start of current parsed sequence. + uCode; + + if (prevBufOffset > 0) // Make prev buf overlap a little to make it easier to slice later. + prevBuf = Buffer.concat([prevBuf, buf.slice(0, 10)]); + + for (var i = 0, j = 0; i < buf.length; i++) { + var curByte = (i >= 0) ? buf[i] : prevBuf[i + prevBufOffset]; + + // Lookup in current trie node. + var uCode = this.decodeTables[nodeIdx][curByte]; + + if (uCode >= 0) { + // Normal character, just use it. + } + else if (uCode === UNASSIGNED) { // Unknown char. + // TODO: Callback with seq. + //var curSeq = (seqStart >= 0) ? buf.slice(seqStart, i+1) : prevBuf.slice(seqStart + prevBufOffset, i+1 + prevBufOffset); + i = seqStart; // Try to parse again, after skipping first byte of the sequence ('i' will be incremented by 'for' cycle). + uCode = this.defaultCharUnicode.charCodeAt(0); + } + else if (uCode === GB18030_CODE) { + var curSeq = (seqStart >= 0) ? buf.slice(seqStart, i+1) : prevBuf.slice(seqStart + prevBufOffset, i+1 + prevBufOffset); + var ptr = (curSeq[0]-0x81)*12600 + (curSeq[1]-0x30)*1260 + (curSeq[2]-0x81)*10 + (curSeq[3]-0x30); + var idx = findIdx(this.gb18030.gbChars, ptr); + uCode = this.gb18030.uChars[idx] + ptr - this.gb18030.gbChars[idx]; + } + else if (uCode <= NODE_START) { // Go to next trie node. + nodeIdx = NODE_START - uCode; + continue; + } + else if (uCode <= SEQ_START) { // Output a sequence of chars. + var seq = this.decodeTableSeq[SEQ_START - uCode]; + for (var k = 0; k < seq.length - 1; k++) { + uCode = seq[k]; + newBuf[j++] = uCode & 0xFF; + newBuf[j++] = uCode >> 8; + } + uCode = seq[seq.length-1]; + } + else + throw new Error("iconv-lite internal error: invalid decoding table value " + uCode + " at " + nodeIdx + "/" + curByte); + + // Write the character to buffer, handling higher planes using surrogate pair. + if (uCode > 0xFFFF) { + uCode -= 0x10000; + var uCodeLead = 0xD800 + Math.floor(uCode / 0x400); + newBuf[j++] = uCodeLead & 0xFF; + newBuf[j++] = uCodeLead >> 8; + + uCode = 0xDC00 + uCode % 0x400; + } + newBuf[j++] = uCode & 0xFF; + newBuf[j++] = uCode >> 8; + + // Reset trie node. + nodeIdx = 0; seqStart = i+1; + } + + this.nodeIdx = nodeIdx; + this.prevBuf = (seqStart >= 0) ? buf.slice(seqStart) : prevBuf.slice(seqStart + prevBufOffset); + return newBuf.slice(0, j).toString('ucs2'); +} + +DBCSDecoder.prototype.end = function() { + var ret = ''; + + // Try to parse all remaining chars. + while (this.prevBuf.length > 0) { + // Skip 1 character in the buffer. + ret += this.defaultCharUnicode; + var buf = this.prevBuf.slice(1); + + // Parse remaining as usual. + this.prevBuf = new Buffer(0); + this.nodeIdx = 0; + if (buf.length > 0) + ret += this.write(buf); + } + + this.nodeIdx = 0; + return ret; +} + +// Binary search for GB18030. Returns largest i such that table[i] <= val. +function findIdx(table, val) { + if (table[0] > val) + return -1; + + var l = 0, r = table.length; + while (l < r-1) { // always table[l] <= val < table[r] + var mid = l + Math.floor((r-l+1)/2); + if (table[mid] <= val) + l = mid; + else + r = mid; + } + return l; +} + diff --git a/nodejs/node_modules/iconv-lite/encodings/dbcs-data.js b/nodejs/node_modules/iconv-lite/encodings/dbcs-data.js new file mode 100644 index 000000000..4b6191434 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/dbcs-data.js @@ -0,0 +1,176 @@ +"use strict"; + +// Description of supported double byte encodings and aliases. +// Tables are not require()-d until they are needed to speed up library load. +// require()-s are direct to support Browserify. + +module.exports = { + + // == Japanese/ShiftJIS ==================================================== + // All japanese encodings are based on JIS X set of standards: + // JIS X 0201 - Single-byte encoding of ASCII + ¥ + Kana chars at 0xA1-0xDF. + // JIS X 0208 - Main set of 6879 characters, placed in 94x94 plane, to be encoded by 2 bytes. + // Has several variations in 1978, 1983, 1990 and 1997. + // JIS X 0212 - Supplementary plane of 6067 chars in 94x94 plane. 1990. Effectively dead. + // JIS X 0213 - Extension and modern replacement of 0208 and 0212. Total chars: 11233. + // 2 planes, first is superset of 0208, second - revised 0212. + // Introduced in 2000, revised 2004. Some characters are in Unicode Plane 2 (0x2xxxx) + + // Byte encodings are: + // * Shift_JIS: Compatible with 0201, uses not defined chars in top half as lead bytes for double-byte + // encoding of 0208. Lead byte ranges: 0x81-0x9F, 0xE0-0xEF; Trail byte ranges: 0x40-0x7E, 0x80-0x9E, 0x9F-0xFC. + // Windows CP932 is a superset of Shift_JIS. Some companies added more chars, notably KDDI. + // * EUC-JP: Up to 3 bytes per character. Used mostly on *nixes. + // 0x00-0x7F - lower part of 0201 + // 0x8E, 0xA1-0xDF - upper part of 0201 + // (0xA1-0xFE)x2 - 0208 plane (94x94). + // 0x8F, (0xA1-0xFE)x2 - 0212 plane (94x94). + // * JIS X 208: 7-bit, direct encoding of 0208. Byte ranges: 0x21-0x7E (94 values). Uncommon. + // Used as-is in ISO2022 family. + // * ISO2022-JP: Stateful encoding, with escape sequences to switch between ASCII, + // 0201-1976 Roman, 0208-1978, 0208-1983. + // * ISO2022-JP-1: Adds esc seq for 0212-1990. + // * ISO2022-JP-2: Adds esc seq for GB2313-1980, KSX1001-1992, ISO8859-1, ISO8859-7. + // * ISO2022-JP-3: Adds esc seq for 0201-1976 Kana set, 0213-2000 Planes 1, 2. + // * ISO2022-JP-2004: Adds 0213-2004 Plane 1. + // + // After JIS X 0213 appeared, Shift_JIS-2004, EUC-JISX0213 and ISO2022-JP-2004 followed, with just changing the planes. + // + // Overall, it seems that it's a mess :( http://www8.plala.or.jp/tkubota1/unicode-symbols-map2.html + + 'shiftjis': { + type: '_dbcs', + table: function() { return require('./tables/shiftjis.json') }, + encodeAdd: {'\u00a5': 0x5C, '\u203E': 0x7E}, + encodeSkipVals: [{from: 0xED40, to: 0xF940}], + }, + 'csshiftjis': 'shiftjis', + 'mskanji': 'shiftjis', + 'sjis': 'shiftjis', + 'windows31j': 'shiftjis', + 'ms31j': 'shiftjis', + 'xsjis': 'shiftjis', + 'windows932': 'shiftjis', + 'ms932': 'shiftjis', + '932': 'shiftjis', + 'cp932': 'shiftjis', + + 'eucjp': { + type: '_dbcs', + table: function() { return require('./tables/eucjp.json') }, + encodeAdd: {'\u00a5': 0x5C, '\u203E': 0x7E}, + }, + + // TODO: KDDI extension to Shift_JIS + // TODO: IBM CCSID 942 = CP932, but F0-F9 custom chars and other char changes. + // TODO: IBM CCSID 943 = Shift_JIS = CP932 with original Shift_JIS lower 128 chars. + + + // == Chinese/GBK ========================================================== + // http://en.wikipedia.org/wiki/GBK + // We mostly implement W3C recommendation: https://www.w3.org/TR/encoding/#gbk-encoder + + // Oldest GB2312 (1981, ~7600 chars) is a subset of CP936 + 'gb2312': 'cp936', + 'gb231280': 'cp936', + 'gb23121980': 'cp936', + 'csgb2312': 'cp936', + 'csiso58gb231280': 'cp936', + 'euccn': 'cp936', + + // Microsoft's CP936 is a subset and approximation of GBK. + 'windows936': 'cp936', + 'ms936': 'cp936', + '936': 'cp936', + 'cp936': { + type: '_dbcs', + table: function() { return require('./tables/cp936.json') }, + }, + + // GBK (~22000 chars) is an extension of CP936 that added user-mapped chars and some other. + 'gbk': { + type: '_dbcs', + table: function() { return require('./tables/cp936.json').concat(require('./tables/gbk-added.json')) }, + }, + 'xgbk': 'gbk', + 'isoir58': 'gbk', + + // GB18030 is an algorithmic extension of GBK. + // Main source: https://www.w3.org/TR/encoding/#gbk-encoder + // http://icu-project.org/docs/papers/gb18030.html + // http://source.icu-project.org/repos/icu/data/trunk/charset/data/xml/gb-18030-2000.xml + // http://www.khngai.com/chinese/charmap/tblgbk.php?page=0 + 'gb18030': { + type: '_dbcs', + table: function() { return require('./tables/cp936.json').concat(require('./tables/gbk-added.json')) }, + gb18030: function() { return require('./tables/gb18030-ranges.json') }, + encodeSkipVals: [0x80], + encodeAdd: {'€': 0xA2E3}, + }, + + 'chinese': 'gb18030', + + + // == Korean =============================================================== + // EUC-KR, KS_C_5601 and KS X 1001 are exactly the same. + 'windows949': 'cp949', + 'ms949': 'cp949', + '949': 'cp949', + 'cp949': { + type: '_dbcs', + table: function() { return require('./tables/cp949.json') }, + }, + + 'cseuckr': 'cp949', + 'csksc56011987': 'cp949', + 'euckr': 'cp949', + 'isoir149': 'cp949', + 'korean': 'cp949', + 'ksc56011987': 'cp949', + 'ksc56011989': 'cp949', + 'ksc5601': 'cp949', + + + // == Big5/Taiwan/Hong Kong ================================================ + // There are lots of tables for Big5 and cp950. Please see the following links for history: + // http://moztw.org/docs/big5/ http://www.haible.de/bruno/charsets/conversion-tables/Big5.html + // Variations, in roughly number of defined chars: + // * Windows CP 950: Microsoft variant of Big5. Canonical: http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP950.TXT + // * Windows CP 951: Microsoft variant of Big5-HKSCS-2001. Seems to be never public. http://me.abelcheung.org/articles/research/what-is-cp951/ + // * Big5-2003 (Taiwan standard) almost superset of cp950. + // * Unicode-at-on (UAO) / Mozilla 1.8. Falling out of use on the Web. Not supported by other browsers. + // * Big5-HKSCS (-2001, -2004, -2008). Hong Kong standard. + // many unicode code points moved from PUA to Supplementary plane (U+2XXXX) over the years. + // Plus, it has 4 combining sequences. + // Seems that Mozilla refused to support it for 10 yrs. https://bugzilla.mozilla.org/show_bug.cgi?id=162431 https://bugzilla.mozilla.org/show_bug.cgi?id=310299 + // because big5-hkscs is the only encoding to include astral characters in non-algorithmic way. + // Implementations are not consistent within browsers; sometimes labeled as just big5. + // MS Internet Explorer switches from big5 to big5-hkscs when a patch applied. + // Great discussion & recap of what's going on https://bugzilla.mozilla.org/show_bug.cgi?id=912470#c31 + // In the encoder, it might make sense to support encoding old PUA mappings to Big5 bytes seq-s. + // Official spec: http://www.ogcio.gov.hk/en/business/tech_promotion/ccli/terms/doc/2003cmp_2008.txt + // http://www.ogcio.gov.hk/tc/business/tech_promotion/ccli/terms/doc/hkscs-2008-big5-iso.txt + // + // Current understanding of how to deal with Big5(-HKSCS) is in the Encoding Standard, http://encoding.spec.whatwg.org/#big5-encoder + // Unicode mapping (http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT) is said to be wrong. + + 'windows950': 'cp950', + 'ms950': 'cp950', + '950': 'cp950', + 'cp950': { + type: '_dbcs', + table: function() { return require('./tables/cp950.json') }, + }, + + // Big5 has many variations and is an extension of cp950. We use Encoding Standard's as a consensus. + 'big5': 'big5hkscs', + 'big5hkscs': { + type: '_dbcs', + table: function() { return require('./tables/cp950.json').concat(require('./tables/big5-added.json')) }, + encodeSkipVals: [0xa2cc], + }, + + 'cnbig5': 'big5hkscs', + 'csbig5': 'big5hkscs', + 'xxbig5': 'big5hkscs', +}; diff --git a/nodejs/node_modules/iconv-lite/encodings/index.js b/nodejs/node_modules/iconv-lite/encodings/index.js new file mode 100644 index 000000000..e30400317 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/index.js @@ -0,0 +1,22 @@ +"use strict"; + +// Update this array if you add/rename/remove files in this directory. +// We support Browserify by skipping automatic module discovery and requiring modules directly. +var modules = [ + require("./internal"), + require("./utf16"), + require("./utf7"), + require("./sbcs-codec"), + require("./sbcs-data"), + require("./sbcs-data-generated"), + require("./dbcs-codec"), + require("./dbcs-data"), +]; + +// Put all encoding/alias/codec definitions to single object and export it. +for (var i = 0; i < modules.length; i++) { + var module = modules[i]; + for (var enc in module) + if (Object.prototype.hasOwnProperty.call(module, enc)) + exports[enc] = module[enc]; +} diff --git a/nodejs/node_modules/iconv-lite/encodings/internal.js b/nodejs/node_modules/iconv-lite/encodings/internal.js new file mode 100644 index 000000000..b0adf6a92 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/internal.js @@ -0,0 +1,188 @@ +"use strict"; +var Buffer = require("buffer").Buffer; + +// Export Node.js internal encodings. + +module.exports = { + // Encodings + utf8: { type: "_internal", bomAware: true}, + cesu8: { type: "_internal", bomAware: true}, + unicode11utf8: "utf8", + + ucs2: { type: "_internal", bomAware: true}, + utf16le: "ucs2", + + binary: { type: "_internal" }, + base64: { type: "_internal" }, + hex: { type: "_internal" }, + + // Codec. + _internal: InternalCodec, +}; + +//------------------------------------------------------------------------------ + +function InternalCodec(codecOptions, iconv) { + this.enc = codecOptions.encodingName; + this.bomAware = codecOptions.bomAware; + + if (this.enc === "base64") + this.encoder = InternalEncoderBase64; + else if (this.enc === "cesu8") { + this.enc = "utf8"; // Use utf8 for decoding. + this.encoder = InternalEncoderCesu8; + + // Add decoder for versions of Node not supporting CESU-8 + if (new Buffer('eda0bdedb2a9', 'hex').toString() !== '💩') { + this.decoder = InternalDecoderCesu8; + this.defaultCharUnicode = iconv.defaultCharUnicode; + } + } +} + +InternalCodec.prototype.encoder = InternalEncoder; +InternalCodec.prototype.decoder = InternalDecoder; + +//------------------------------------------------------------------------------ + +// We use node.js internal decoder. Its signature is the same as ours. +var StringDecoder = require('string_decoder').StringDecoder; + +if (!StringDecoder.prototype.end) // Node v0.8 doesn't have this method. + StringDecoder.prototype.end = function() {}; + + +function InternalDecoder(options, codec) { + StringDecoder.call(this, codec.enc); +} + +InternalDecoder.prototype = StringDecoder.prototype; + + +//------------------------------------------------------------------------------ +// Encoder is mostly trivial + +function InternalEncoder(options, codec) { + this.enc = codec.enc; +} + +InternalEncoder.prototype.write = function(str) { + return new Buffer(str, this.enc); +} + +InternalEncoder.prototype.end = function() { +} + + +//------------------------------------------------------------------------------ +// Except base64 encoder, which must keep its state. + +function InternalEncoderBase64(options, codec) { + this.prevStr = ''; +} + +InternalEncoderBase64.prototype.write = function(str) { + str = this.prevStr + str; + var completeQuads = str.length - (str.length % 4); + this.prevStr = str.slice(completeQuads); + str = str.slice(0, completeQuads); + + return new Buffer(str, "base64"); +} + +InternalEncoderBase64.prototype.end = function() { + return new Buffer(this.prevStr, "base64"); +} + + +//------------------------------------------------------------------------------ +// CESU-8 encoder is also special. + +function InternalEncoderCesu8(options, codec) { +} + +InternalEncoderCesu8.prototype.write = function(str) { + var buf = new Buffer(str.length * 3), bufIdx = 0; + for (var i = 0; i < str.length; i++) { + var charCode = str.charCodeAt(i); + // Naive implementation, but it works because CESU-8 is especially easy + // to convert from UTF-16 (which all JS strings are encoded in). + if (charCode < 0x80) + buf[bufIdx++] = charCode; + else if (charCode < 0x800) { + buf[bufIdx++] = 0xC0 + (charCode >>> 6); + buf[bufIdx++] = 0x80 + (charCode & 0x3f); + } + else { // charCode will always be < 0x10000 in javascript. + buf[bufIdx++] = 0xE0 + (charCode >>> 12); + buf[bufIdx++] = 0x80 + ((charCode >>> 6) & 0x3f); + buf[bufIdx++] = 0x80 + (charCode & 0x3f); + } + } + return buf.slice(0, bufIdx); +} + +InternalEncoderCesu8.prototype.end = function() { +} + +//------------------------------------------------------------------------------ +// CESU-8 decoder is not implemented in Node v4.0+ + +function InternalDecoderCesu8(options, codec) { + this.acc = 0; + this.contBytes = 0; + this.accBytes = 0; + this.defaultCharUnicode = codec.defaultCharUnicode; +} + +InternalDecoderCesu8.prototype.write = function(buf) { + var acc = this.acc, contBytes = this.contBytes, accBytes = this.accBytes, + res = ''; + for (var i = 0; i < buf.length; i++) { + var curByte = buf[i]; + if ((curByte & 0xC0) !== 0x80) { // Leading byte + if (contBytes > 0) { // Previous code is invalid + res += this.defaultCharUnicode; + contBytes = 0; + } + + if (curByte < 0x80) { // Single-byte code + res += String.fromCharCode(curByte); + } else if (curByte < 0xE0) { // Two-byte code + acc = curByte & 0x1F; + contBytes = 1; accBytes = 1; + } else if (curByte < 0xF0) { // Three-byte code + acc = curByte & 0x0F; + contBytes = 2; accBytes = 1; + } else { // Four or more are not supported for CESU-8. + res += this.defaultCharUnicode; + } + } else { // Continuation byte + if (contBytes > 0) { // We're waiting for it. + acc = (acc << 6) | (curByte & 0x3f); + contBytes--; accBytes++; + if (contBytes === 0) { + // Check for overlong encoding, but support Modified UTF-8 (encoding NULL as C0 80) + if (accBytes === 2 && acc < 0x80 && acc > 0) + res += this.defaultCharUnicode; + else if (accBytes === 3 && acc < 0x800) + res += this.defaultCharUnicode; + else + // Actually add character. + res += String.fromCharCode(acc); + } + } else { // Unexpected continuation byte + res += this.defaultCharUnicode; + } + } + } + this.acc = acc; this.contBytes = contBytes; this.accBytes = accBytes; + return res; +} + +InternalDecoderCesu8.prototype.end = function() { + var res = 0; + if (this.contBytes > 0) + res += this.defaultCharUnicode; + return res; +} diff --git a/nodejs/node_modules/iconv-lite/encodings/sbcs-codec.js b/nodejs/node_modules/iconv-lite/encodings/sbcs-codec.js new file mode 100644 index 000000000..7789e00ed --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/sbcs-codec.js @@ -0,0 +1,73 @@ +"use strict"; +var Buffer = require("buffer").Buffer; + +// Single-byte codec. Needs a 'chars' string parameter that contains 256 or 128 chars that +// correspond to encoded bytes (if 128 - then lower half is ASCII). + +exports._sbcs = SBCSCodec; +function SBCSCodec(codecOptions, iconv) { + if (!codecOptions) + throw new Error("SBCS codec is called without the data.") + + // Prepare char buffer for decoding. + if (!codecOptions.chars || (codecOptions.chars.length !== 128 && codecOptions.chars.length !== 256)) + throw new Error("Encoding '"+codecOptions.type+"' has incorrect 'chars' (must be of len 128 or 256)"); + + if (codecOptions.chars.length === 128) { + var asciiString = ""; + for (var i = 0; i < 128; i++) + asciiString += String.fromCharCode(i); + codecOptions.chars = asciiString + codecOptions.chars; + } + + this.decodeBuf = new Buffer(codecOptions.chars, 'ucs2'); + + // Encoding buffer. + var encodeBuf = new Buffer(65536); + encodeBuf.fill(iconv.defaultCharSingleByte.charCodeAt(0)); + + for (var i = 0; i < codecOptions.chars.length; i++) + encodeBuf[codecOptions.chars.charCodeAt(i)] = i; + + this.encodeBuf = encodeBuf; +} + +SBCSCodec.prototype.encoder = SBCSEncoder; +SBCSCodec.prototype.decoder = SBCSDecoder; + + +function SBCSEncoder(options, codec) { + this.encodeBuf = codec.encodeBuf; +} + +SBCSEncoder.prototype.write = function(str) { + var buf = new Buffer(str.length); + for (var i = 0; i < str.length; i++) + buf[i] = this.encodeBuf[str.charCodeAt(i)]; + + return buf; +} + +SBCSEncoder.prototype.end = function() { +} + + +function SBCSDecoder(options, codec) { + this.decodeBuf = codec.decodeBuf; +} + +SBCSDecoder.prototype.write = function(buf) { + // Strings are immutable in JS -> we use ucs2 buffer to speed up computations. + var decodeBuf = this.decodeBuf; + var newBuf = new Buffer(buf.length*2); + var idx1 = 0, idx2 = 0; + for (var i = 0; i < buf.length; i++) { + idx1 = buf[i]*2; idx2 = i*2; + newBuf[idx2] = decodeBuf[idx1]; + newBuf[idx2+1] = decodeBuf[idx1+1]; + } + return newBuf.toString('ucs2'); +} + +SBCSDecoder.prototype.end = function() { +} diff --git a/nodejs/node_modules/iconv-lite/encodings/sbcs-data-generated.js b/nodejs/node_modules/iconv-lite/encodings/sbcs-data-generated.js new file mode 100644 index 000000000..9b4823607 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/sbcs-data-generated.js @@ -0,0 +1,451 @@ +"use strict"; + +// Generated data for sbcs codec. Don't edit manually. Regenerate using generation/gen-sbcs.js script. +module.exports = { + "437": "cp437", + "737": "cp737", + "775": "cp775", + "850": "cp850", + "852": "cp852", + "855": "cp855", + "856": "cp856", + "857": "cp857", + "858": "cp858", + "860": "cp860", + "861": "cp861", + "862": "cp862", + "863": "cp863", + "864": "cp864", + "865": "cp865", + "866": "cp866", + "869": "cp869", + "874": "windows874", + "922": "cp922", + "1046": "cp1046", + "1124": "cp1124", + "1125": "cp1125", + "1129": "cp1129", + "1133": "cp1133", + "1161": "cp1161", + "1162": "cp1162", + "1163": "cp1163", + "1250": "windows1250", + "1251": "windows1251", + "1252": "windows1252", + "1253": "windows1253", + "1254": "windows1254", + "1255": "windows1255", + "1256": "windows1256", + "1257": "windows1257", + "1258": "windows1258", + "28591": "iso88591", + "28592": "iso88592", + "28593": "iso88593", + "28594": "iso88594", + "28595": "iso88595", + "28596": "iso88596", + "28597": "iso88597", + "28598": "iso88598", + "28599": "iso88599", + "28600": "iso885910", + "28601": "iso885911", + "28603": "iso885913", + "28604": "iso885914", + "28605": "iso885915", + "28606": "iso885916", + "windows874": { + "type": "_sbcs", + "chars": "€����…�����������‘’“”•–—�������� กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����" + }, + "win874": "windows874", + "cp874": "windows874", + "windows1250": { + "type": "_sbcs", + "chars": "€�‚�„…†‡�‰Š‹ŚŤŽŹ�‘’“”•–—�™š›śťžź ˇ˘Ł¤Ą¦§¨©Ş«¬­®Ż°±˛ł´µ¶·¸ąş»Ľ˝ľżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙" + }, + "win1250": "windows1250", + "cp1250": "windows1250", + "windows1251": { + "type": "_sbcs", + "chars": "ЂЃ‚ѓ„…†‡€‰Љ‹ЊЌЋЏђ‘’“”•–—�™љ›њќћџ ЎўЈ¤Ґ¦§Ё©Є«¬­®Ї°±Ііґµ¶·ё№є»јЅѕїАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя" + }, + "win1251": "windows1251", + "cp1251": "windows1251", + "windows1252": { + "type": "_sbcs", + "chars": "€�‚ƒ„…†‡ˆ‰Š‹Œ�Ž��‘’“”•–—˜™š›œ�žŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ" + }, + "win1252": "windows1252", + "cp1252": "windows1252", + "windows1253": { + "type": "_sbcs", + "chars": "€�‚ƒ„…†‡�‰�‹�����‘’“”•–—�™�›���� ΅Ά£¤¥¦§¨©�«¬­®―°±²³΄µ¶·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ�" + }, + "win1253": "windows1253", + "cp1253": "windows1253", + "windows1254": { + "type": "_sbcs", + "chars": "€�‚ƒ„…†‡ˆ‰Š‹Œ����‘’“”•–—˜™š›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ" + }, + "win1254": "windows1254", + "cp1254": "windows1254", + "windows1255": { + "type": "_sbcs", + "chars": "€�‚ƒ„…†‡ˆ‰�‹�����‘’“”•–—˜™�›���� ¡¢£₪¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾¿ְֱֲֳִֵֶַָֹֺֻּֽ־ֿ׀ׁׂ׃װױײ׳״�������אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏�" + }, + "win1255": "windows1255", + "cp1255": "windows1255", + "windows1256": { + "type": "_sbcs", + "chars": "€پ‚ƒ„…†‡ˆ‰ٹ‹Œچژڈگ‘’“”•–—ک™ڑ›œ‌‍ں ،¢£¤¥¦§¨©ھ«¬­®¯°±²³´µ¶·¸¹؛»¼½¾؟ہءآأؤإئابةتثجحخدذرزسشصض×طظعغـفقكàلâمنهوçèéêëىيîïًٌٍَôُِ÷ّùْûü‎‏ے" + }, + "win1256": "windows1256", + "cp1256": "windows1256", + "windows1257": { + "type": "_sbcs", + "chars": "€�‚�„…†‡�‰�‹�¨ˇ¸�‘’“”•–—�™�›�¯˛� �¢£¤�¦§Ø©Ŗ«¬­®Æ°±²³´µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž˙" + }, + "win1257": "windows1257", + "cp1257": "windows1257", + "windows1258": { + "type": "_sbcs", + "chars": "€�‚ƒ„…†‡ˆ‰�‹Œ����‘’“”•–—˜™�›œ��Ÿ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ" + }, + "win1258": "windows1258", + "cp1258": "windows1258", + "iso88591": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ" + }, + "cp28591": "iso88591", + "iso88592": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ą˘Ł¤ĽŚ§¨ŠŞŤŹ­ŽŻ°ą˛ł´ľśˇ¸šşťź˝žżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö÷řůúűüýţ˙" + }, + "cp28592": "iso88592", + "iso88593": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ħ˘£¤�Ĥ§¨İŞĞĴ­�Ż°ħ²³´µĥ·¸ışğĵ½�żÀÁÂ�ÄĊĈÇÈÉÊËÌÍÎÏ�ÑÒÓÔĠÖ×ĜÙÚÛÜŬŜßàáâ�äċĉçèéêëìíîï�ñòóôġö÷ĝùúûüŭŝ˙" + }, + "cp28593": "iso88593", + "iso88594": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄĸŖ¤ĨĻ§¨ŠĒĢŦ­Ž¯°ą˛ŗ´ĩļˇ¸šēģŧŊžŋĀÁÂÃÄÅÆĮČÉĘËĖÍÎĪĐŅŌĶÔÕÖ×ØŲÚÛÜŨŪßāáâãäåæįčéęëėíîīđņōķôõö÷øųúûüũū˙" + }, + "cp28594": "iso88594", + "iso88595": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ЁЂЃЄЅІЇЈЉЊЋЌ­ЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя№ёђѓєѕіїјљњћќ§ўџ" + }, + "cp28595": "iso88595", + "iso88596": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ���¤�������،­�������������؛���؟�ءآأؤإئابةتثجحخدذرزسشصضطظعغ�����ـفقكلمنهوىيًٌٍَُِّْ�������������" + }, + "cp28596": "iso88596", + "iso88597": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ‘’£€₯¦§¨©ͺ«¬­�―°±²³΄΅Ά·ΈΉΊ»Ό½ΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡ�ΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ�" + }, + "cp28597": "iso88597", + "iso88598": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ �¢£¤¥¦§¨©×«¬­®¯°±²³´µ¶·¸¹÷»¼½¾��������������������������������‗אבגדהוזחטיךכלםמןנסעףפץצקרשת��‎‏�" + }, + "cp28598": "iso88598", + "iso88599": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞßàáâãäåæçèéêëìíîïğñòóôõö÷øùúûüışÿ" + }, + "cp28599": "iso88599", + "iso885910": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄĒĢĪĨĶ§ĻĐŠŦŽ­ŪŊ°ąēģīĩķ·ļđšŧž―ūŋĀÁÂÃÄÅÆĮČÉĘËĖÍÎÏÐŅŌÓÔÕÖŨØŲÚÛÜÝÞßāáâãäåæįčéęëėíîïðņōóôõöũøųúûüýþĸ" + }, + "cp28600": "iso885910", + "iso885911": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����" + }, + "cp28601": "iso885911", + "iso885913": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ”¢£¤„¦§Ø©Ŗ«¬­®Æ°±²³“µ¶·ø¹ŗ»¼½¾æĄĮĀĆÄÅĘĒČÉŹĖĢĶĪĻŠŃŅÓŌÕÖ×ŲŁŚŪÜŻŽßąįāćäåęēčéźėģķīļšńņóōõö÷ųłśūüżž’" + }, + "cp28603": "iso885913", + "iso885914": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ Ḃḃ£ĊċḊ§Ẁ©ẂḋỲ­®ŸḞḟĠġṀṁ¶ṖẁṗẃṠỳẄẅṡÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏŴÑÒÓÔÕÖṪØÙÚÛÜÝŶßàáâãäåæçèéêëìíîïŵñòóôõöṫøùúûüýŷÿ" + }, + "cp28604": "iso885914", + "iso885915": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£€¥Š§š©ª«¬­®¯°±²³Žµ¶·ž¹º»ŒœŸ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ" + }, + "cp28605": "iso885915", + "iso885916": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ĄąŁ€„Š§š©Ș«Ź­źŻ°±ČłŽ”¶·žčș»ŒœŸżÀÁÂĂÄĆÆÇÈÉÊËÌÍÎÏĐŃÒÓÔŐÖŚŰÙÚÛÜĘȚßàáâăäćæçèéêëìíîïđńòóôőöśűùúûüęțÿ" + }, + "cp28606": "iso885916", + "cp437": { + "type": "_sbcs", + "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ " + }, + "ibm437": "cp437", + "csibm437": "cp437", + "cp737": { + "type": "_sbcs", + "chars": "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρσςτυφχψ░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀ωάέήϊίόύϋώΆΈΉΊΌΎΏ±≥≤ΪΫ÷≈°∙·√ⁿ²■ " + }, + "ibm737": "cp737", + "csibm737": "cp737", + "cp775": { + "type": "_sbcs", + "chars": "ĆüéāäģåćłēŖŗīŹÄÅÉæÆōöĢ¢ŚśÖÜø£ØפĀĪóŻżź”¦©®¬½¼Ł«»░▒▓│┤ĄČĘĖ╣║╗╝ĮŠ┐└┴┬├─┼ŲŪ╚╔╩╦╠═╬Žąčęėįšųūž┘┌█▄▌▐▀ÓßŌŃõÕµńĶķĻļņĒŅ’­±“¾¶§÷„°∙·¹³²■ " + }, + "ibm775": "cp775", + "csibm775": "cp775", + "cp850": { + "type": "_sbcs", + "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ðÐÊËÈıÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµþÞÚÛÙýݯ´­±‗¾¶§÷¸°¨·¹³²■ " + }, + "ibm850": "cp850", + "csibm850": "cp850", + "cp852": { + "type": "_sbcs", + "chars": "ÇüéâäůćçłëŐőîŹÄĆÉĹĺôöĽľŚśÖÜŤťŁ×čáíóúĄąŽžĘ꬟Ⱥ«»░▒▓│┤ÁÂĚŞ╣║╗╝Żż┐└┴┬├─┼Ăă╚╔╩╦╠═╬¤đĐĎËďŇÍÎě┘┌█▄ŢŮ▀ÓßÔŃńňŠšŔÚŕŰýÝţ´­˝˛ˇ˘§÷¸°¨˙űŘř■ " + }, + "ibm852": "cp852", + "csibm852": "cp852", + "cp855": { + "type": "_sbcs", + "chars": "ђЂѓЃёЁєЄѕЅіІїЇјЈљЉњЊћЋќЌўЎџЏюЮъЪаАбБцЦдДеЕфФгГ«»░▒▓│┤хХиИ╣║╗╝йЙ┐└┴┬├─┼кК╚╔╩╦╠═╬¤лЛмМнНоОп┘┌█▄Пя▀ЯрРсСтТуУжЖвВьЬ№­ыЫзЗшШэЭщЩчЧ§■ " + }, + "ibm855": "cp855", + "csibm855": "cp855", + "cp856": { + "type": "_sbcs", + "chars": "אבגדהוזחטיךכלםמןנסעףפץצקרשת�£�×����������®¬½¼�«»░▒▓│┤���©╣║╗╝¢¥┐└┴┬├─┼��╚╔╩╦╠═╬¤���������┘┌█▄¦�▀������µ�������¯´­±‗¾¶§÷¸°¨·¹³²■ " + }, + "ibm856": "cp856", + "csibm856": "cp856", + "cp857": { + "type": "_sbcs", + "chars": "ÇüéâäàåçêëèïîıÄÅÉæÆôöòûùİÖÜø£ØŞşáíóúñÑĞ𿮬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ºªÊËÈ�ÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµ�×ÚÛÙìÿ¯´­±�¾¶§÷¸°¨·¹³²■ " + }, + "ibm857": "cp857", + "csibm857": "cp857", + "cp858": { + "type": "_sbcs", + "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐└┴┬├─┼ãÃ╚╔╩╦╠═╬¤ðÐÊËÈ€ÍÎÏ┘┌█▄¦Ì▀ÓßÔÒõÕµþÞÚÛÙýݯ´­±‗¾¶§÷¸°¨·¹³²■ " + }, + "ibm858": "cp858", + "csibm858": "cp858", + "cp860": { + "type": "_sbcs", + "chars": "ÇüéâãàÁçêÊèÍÔìÃÂÉÀÈôõòÚùÌÕÜ¢£Ù₧ÓáíóúñѪº¿Ò¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ " + }, + "ibm860": "cp860", + "csibm860": "cp860", + "cp861": { + "type": "_sbcs", + "chars": "ÇüéâäàåçêëèÐðÞÄÅÉæÆôöþûÝýÖÜø£Ø₧ƒáíóúÁÍÓÚ¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ " + }, + "ibm861": "cp861", + "csibm861": "cp861", + "cp862": { + "type": "_sbcs", + "chars": "אבגדהוזחטיךכלםמןנסעףפץצקרשת¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ " + }, + "ibm862": "cp862", + "csibm862": "cp862", + "cp863": { + "type": "_sbcs", + "chars": "ÇüéâÂà¶çêëèïî‗À§ÉÈÊôËÏûù¤ÔÜ¢£ÙÛƒ¦´óú¨¸³¯Î⌐¬½¼¾«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ " + }, + "ibm863": "cp863", + "csibm863": "cp863", + "cp864": { + "type": "_sbcs", + "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$٪&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~°·∙√▒─│┼┤┬├┴┐┌└┘β∞φ±½¼≈«»ﻷﻸ��ﻻﻼ� ­ﺂ£¤ﺄ��ﺎﺏﺕﺙ،ﺝﺡﺥ٠١٢٣٤٥٦٧٨٩ﻑ؛ﺱﺵﺹ؟¢ﺀﺁﺃﺅﻊﺋﺍﺑﺓﺗﺛﺟﺣﺧﺩﺫﺭﺯﺳﺷﺻﺿﻁﻅﻋﻏ¦¬÷×ﻉـﻓﻗﻛﻟﻣﻧﻫﻭﻯﻳﺽﻌﻎﻍﻡﹽّﻥﻩﻬﻰﻲﻐﻕﻵﻶﻝﻙﻱ■�" + }, + "ibm864": "cp864", + "csibm864": "cp864", + "cp865": { + "type": "_sbcs", + "chars": "ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø₧ƒáíóúñѪº¿⌐¬½¼¡«¤░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ " + }, + "ibm865": "cp865", + "csibm865": "cp865", + "cp866": { + "type": "_sbcs", + "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёЄєЇїЎў°∙·√№¤■ " + }, + "ibm866": "cp866", + "csibm866": "cp866", + "cp869": { + "type": "_sbcs", + "chars": "������Ά�·¬¦‘’Έ―ΉΊΪΌ��ΎΫ©Ώ²³ά£έήίϊΐόύΑΒΓΔΕΖΗ½ΘΙ«»░▒▓│┤ΚΛΜΝ╣║╗╝ΞΟ┐└┴┬├─┼ΠΡ╚╔╩╦╠═╬ΣΤΥΦΧΨΩαβγ┘┌█▄δε▀ζηθικλμνξοπρσςτ΄­±υφχ§ψ΅°¨ωϋΰώ■ " + }, + "ibm869": "cp869", + "csibm869": "cp869", + "cp922": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®‾°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏŠÑÒÓÔÕÖ×ØÙÚÛÜÝŽßàáâãäåæçèéêëìíîïšñòóôõö÷øùúûüýžÿ" + }, + "ibm922": "cp922", + "csibm922": "cp922", + "cp1046": { + "type": "_sbcs", + "chars": "ﺈ×÷ﹱˆ■│─┐┌└┘ﹹﹻﹽﹿﹷﺊﻰﻳﻲﻎﻏﻐﻶﻸﻺﻼ ¤ﺋﺑﺗﺛﺟﺣ،­ﺧﺳ٠١٢٣٤٥٦٧٨٩ﺷ؛ﺻﺿﻊ؟ﻋءآأؤإئابةتثجحخدذرزسشصضطﻇعغﻌﺂﺄﺎﻓـفقكلمنهوىيًٌٍَُِّْﻗﻛﻟﻵﻷﻹﻻﻣﻧﻬﻩ�" + }, + "ibm1046": "cp1046", + "csibm1046": "cp1046", + "cp1124": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ЁЂҐЄЅІЇЈЉЊЋЌ­ЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя№ёђґєѕіїјљњћќ§ўџ" + }, + "ibm1124": "cp1124", + "csibm1124": "cp1124", + "cp1125": { + "type": "_sbcs", + "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёҐґЄєІіЇї·√№¤■ " + }, + "ibm1125": "cp1125", + "csibm1125": "cp1125", + "cp1129": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§œ©ª«¬­®¯°±²³Ÿµ¶·Œ¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ" + }, + "ibm1129": "cp1129", + "csibm1129": "cp1129", + "cp1133": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ກຂຄງຈສຊຍດຕຖທນບປຜຝພຟມຢຣລວຫອຮ���ຯະາຳິີຶືຸູຼັົຽ���ເແໂໃໄ່້໊໋໌ໍໆ�ໜໝ₭����������������໐໑໒໓໔໕໖໗໘໙��¢¬¦�" + }, + "ibm1133": "cp1133", + "csibm1133": "cp1133", + "cp1161": { + "type": "_sbcs", + "chars": "��������������������������������่กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู้๊๋€฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛¢¬¦ " + }, + "ibm1161": "cp1161", + "csibm1161": "cp1161", + "cp1162": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����" + }, + "ibm1162": "cp1162", + "csibm1162": "cp1162", + "cp1163": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£€¥¦§œ©ª«¬­®¯°±²³Ÿµ¶·Œ¹º»¼½¾¿ÀÁÂĂÄÅÆÇÈÉÊË̀ÍÎÏĐÑ̉ÓÔƠÖ×ØÙÚÛÜỮßàáâăäåæçèéêë́íîïđṇ̃óôơö÷øùúûüư₫ÿ" + }, + "ibm1163": "cp1163", + "csibm1163": "cp1163", + "maccroatian": { + "type": "_sbcs", + "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®Š™´¨≠ŽØ∞±≤≥∆µ∂∑∏š∫ªºΩžø¿¡¬√ƒ≈Ć«Č… ÀÃÕŒœĐ—“”‘’÷◊�©⁄¤‹›Æ»–·‚„‰ÂćÁčÈÍÎÏÌÓÔđÒÚÛÙıˆ˜¯πË˚¸Êæˇ" + }, + "maccyrillic": { + "type": "_sbcs", + "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°¢£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµ∂ЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю¤" + }, + "macgreek": { + "type": "_sbcs", + "chars": "Ĺ²É³ÖÜ΅àâä΄¨çéèê룙î‰ôö¦­ùûü†ΓΔΘΛΞΠß®©ΣΪ§≠°·Α±≤≥¥ΒΕΖΗΙΚΜΦΫΨΩάΝ¬ΟΡ≈Τ«»… ΥΧΆΈœ–―“”‘’÷ΉΊΌΎέήίόΏύαβψδεφγηιξκλμνοπώρστθωςχυζϊϋΐΰ�" + }, + "maciceland": { + "type": "_sbcs", + "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûüÝ°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤ÐðÞþý·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ" + }, + "macroman": { + "type": "_sbcs", + "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ" + }, + "macromania": { + "type": "_sbcs", + "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ĂŞ∞±≤≥¥µ∂∑∏π∫ªºΩăş¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›Ţţ‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ" + }, + "macthai": { + "type": "_sbcs", + "chars": "«»…“”�•‘’� กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู​–—฿เแโใไๅๆ็่้๊๋์ํ™๏๐๑๒๓๔๕๖๗๘๙®©����" + }, + "macturkish": { + "type": "_sbcs", + "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸĞğİıŞş‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙ�ˆ˜¯˘˙˚¸˝˛ˇ" + }, + "macukraine": { + "type": "_sbcs", + "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ†°Ґ£§•¶І®©™Ђђ≠Ѓѓ∞±≤≥іµґЈЄєЇїЉљЊњјЅ¬√ƒ≈∆«»… ЋћЌќѕ–—“”‘’÷„ЎўЏџ№Ёёяабвгдежзийклмнопрстуфхцчшщъыьэю¤" + }, + "koi8r": { + "type": "_sbcs", + "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ё╓╔╕╖╗╘╙╚╛╜╝╞╟╠╡Ё╢╣╤╥╦╧╨╩╪╫╬©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ" + }, + "koi8u": { + "type": "_sbcs", + "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ёє╔ії╗╘╙╚╛ґ╝╞╟╠╡ЁЄ╣ІЇ╦╧╨╩╪Ґ╬©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ" + }, + "koi8ru": { + "type": "_sbcs", + "chars": "─│┌┐└┘├┤┬┴┼▀▄█▌▐░▒▓⌠■∙√≈≤≥ ⌡°²·÷═║╒ёє╔ії╗╘╙╚╛ґў╞╟╠╡ЁЄ╣ІЇ╦╧╨╩╪ҐЎ©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ" + }, + "koi8t": { + "type": "_sbcs", + "chars": "қғ‚Ғ„…†‡�‰ҳ‹ҲҷҶ�Қ‘’“”•–—�™�›�����ӯӮё¤ӣ¦§���«¬­®�°±²Ё�Ӣ¶·�№�»���©юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ" + }, + "armscii8": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ �և։)(»«—.՝,-֊…՜՛՞ԱաԲբԳգԴդԵեԶզԷէԸըԹթԺժԻիԼլԽխԾծԿկՀհՁձՂղՃճՄմՅյՆնՇշՈոՉչՊպՋջՌռՍսՎվՏտՐրՑցՒւՓփՔքՕօՖֆ՚�" + }, + "rk1048": { + "type": "_sbcs", + "chars": "ЂЃ‚ѓ„…†‡€‰Љ‹ЊҚҺЏђ‘’“”•–—�™љ›њқһџ ҰұӘ¤Ө¦§Ё©Ғ«¬­®Ү°±Ііөµ¶·ё№ғ»әҢңүАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя" + }, + "tcvn": { + "type": "_sbcs", + "chars": "\u0000ÚỤ\u0003ỪỬỮ\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010ỨỰỲỶỸÝỴ\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÀẢÃÁẠẶẬÈẺẼÉẸỆÌỈĨÍỊÒỎÕÓỌỘỜỞỠỚỢÙỦŨ ĂÂÊÔƠƯĐăâêôơưđẶ̀̀̉̃́àảãáạẲằẳẵắẴẮẦẨẪẤỀặầẩẫấậèỂẻẽéẹềểễếệìỉỄẾỒĩíịòỔỏõóọồổỗốộờởỡớợùỖủũúụừửữứựỳỷỹýỵỐ" + }, + "georgianacademy": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿აბგდევზთიკლმნოპჟრსტუფქღყშჩცძწჭხჯჰჱჲჳჴჵჶçèéêëìíîïðñòóôõö÷øùúûüýþÿ" + }, + "georgianps": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿აბგდევზჱთიკლმნჲოპჟრსტჳუფქღყშჩცძწჭხჴჯჰჵæçèéêëìíîïðñòóôõö÷øùúûüýþÿ" + }, + "pt154": { + "type": "_sbcs", + "chars": "ҖҒӮғ„…ҶҮҲүҠӢҢҚҺҸҗ‘’“”•–—ҳҷҡӣңқһҹ ЎўЈӨҘҰ§Ё©Ә«¬ӯ®Ҝ°ұІіҙө¶·ё№ә»јҪҫҝАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя" + }, + "viscii": { + "type": "_sbcs", + "chars": "\u0000\u0001Ẳ\u0003\u0004ẴẪ\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013Ỷ\u0015\u0016\u0017\u0018Ỹ\u001a\u001b\u001c\u001dỴ\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ẠẮẰẶẤẦẨẬẼẸẾỀỂỄỆỐỒỔỖỘỢỚỜỞỊỎỌỈỦŨỤỲÕắằặấầẩậẽẹếềểễệốồổỗỠƠộờởịỰỨỪỬơớƯÀÁÂÃẢĂẳẵÈÉÊẺÌÍĨỳĐứÒÓÔạỷừửÙÚỹỵÝỡưàáâãảăữẫèéêẻìíĩỉđựòóôõỏọụùúũủýợỮ" + }, + "iso646cn": { + "type": "_sbcs", + "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#¥%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}‾��������������������������������������������������������������������������������������������������������������������������������" + }, + "iso646jp": { + "type": "_sbcs", + "chars": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[¥]^_`abcdefghijklmnopqrstuvwxyz{|}‾��������������������������������������������������������������������������������������������������������������������������������" + }, + "hproman8": { + "type": "_sbcs", + "chars": "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ÀÂÈÊËÎÏ´ˋˆ¨˜ÙÛ₤¯Ýý°ÇçÑñ¡¿¤£¥§ƒ¢âêôûáéóúàèòùäëöüÅîØÆåíøæÄìÖÜÉïßÔÁÃãÐðÍÌÓÒÕõŠšÚŸÿÞþ·µ¶¾—¼½ªº«■»±�" + }, + "macintosh": { + "type": "_sbcs", + "chars": "ÄÅÇÉÑÖÜáàâäãåçéèêëíìîïñóòôöõúùûü†°¢£§•¶ß®©™´¨≠ÆØ∞±≤≥¥µ∂∑∏π∫ªºΩæø¿¡¬√ƒ≈∆«»… ÀÃÕŒœ–—“”‘’÷◊ÿŸ⁄¤‹›fifl‡·‚„‰ÂÊÁËÈÍÎÏÌÓÔ�ÒÚÛÙıˆ˜¯˘˙˚¸˝˛ˇ" + }, + "ascii": { + "type": "_sbcs", + "chars": "��������������������������������������������������������������������������������������������������������������������������������" + }, + "tis620": { + "type": "_sbcs", + "chars": "���������������������������������กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรฤลฦวศษสหฬอฮฯะัาำิีึืฺุู����฿เแโใไๅๆ็่้๊๋์ํ๎๏๐๑๒๓๔๕๖๗๘๙๚๛����" + } +} \ No newline at end of file diff --git a/nodejs/node_modules/iconv-lite/encodings/sbcs-data.js b/nodejs/node_modules/iconv-lite/encodings/sbcs-data.js new file mode 100644 index 000000000..2d6f846ad --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/sbcs-data.js @@ -0,0 +1,169 @@ +"use strict"; + +// Manually added data to be used by sbcs codec in addition to generated one. + +module.exports = { + // Not supported by iconv, not sure why. + "10029": "maccenteuro", + "maccenteuro": { + "type": "_sbcs", + "chars": "ÄĀāÉĄÖÜáąČäčĆć鏟ĎíďĒēĖóėôöõúĚěü†°Ę£§•¶ß®©™ę¨≠ģĮįĪ≤≥īĶ∂∑łĻļĽľĹĺŅņѬ√ńŇ∆«»… ňŐÕőŌ–—“”‘’÷◊ōŔŕŘ‹›řŖŗŠ‚„šŚśÁŤťÍŽžŪÓÔūŮÚůŰűŲųÝýķŻŁżĢˇ" + }, + + "808": "cp808", + "ibm808": "cp808", + "cp808": { + "type": "_sbcs", + "chars": "АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀рстуфхцчшщъыьэюяЁёЄєЇїЎў°∙·√№€■ " + }, + + // Aliases of generated encodings. + "ascii8bit": "ascii", + "usascii": "ascii", + "ansix34": "ascii", + "ansix341968": "ascii", + "ansix341986": "ascii", + "csascii": "ascii", + "cp367": "ascii", + "ibm367": "ascii", + "isoir6": "ascii", + "iso646us": "ascii", + "iso646irv": "ascii", + "us": "ascii", + + "latin1": "iso88591", + "latin2": "iso88592", + "latin3": "iso88593", + "latin4": "iso88594", + "latin5": "iso88599", + "latin6": "iso885910", + "latin7": "iso885913", + "latin8": "iso885914", + "latin9": "iso885915", + "latin10": "iso885916", + + "csisolatin1": "iso88591", + "csisolatin2": "iso88592", + "csisolatin3": "iso88593", + "csisolatin4": "iso88594", + "csisolatincyrillic": "iso88595", + "csisolatinarabic": "iso88596", + "csisolatingreek" : "iso88597", + "csisolatinhebrew": "iso88598", + "csisolatin5": "iso88599", + "csisolatin6": "iso885910", + + "l1": "iso88591", + "l2": "iso88592", + "l3": "iso88593", + "l4": "iso88594", + "l5": "iso88599", + "l6": "iso885910", + "l7": "iso885913", + "l8": "iso885914", + "l9": "iso885915", + "l10": "iso885916", + + "isoir14": "iso646jp", + "isoir57": "iso646cn", + "isoir100": "iso88591", + "isoir101": "iso88592", + "isoir109": "iso88593", + "isoir110": "iso88594", + "isoir144": "iso88595", + "isoir127": "iso88596", + "isoir126": "iso88597", + "isoir138": "iso88598", + "isoir148": "iso88599", + "isoir157": "iso885910", + "isoir166": "tis620", + "isoir179": "iso885913", + "isoir199": "iso885914", + "isoir203": "iso885915", + "isoir226": "iso885916", + + "cp819": "iso88591", + "ibm819": "iso88591", + + "cyrillic": "iso88595", + + "arabic": "iso88596", + "arabic8": "iso88596", + "ecma114": "iso88596", + "asmo708": "iso88596", + + "greek" : "iso88597", + "greek8" : "iso88597", + "ecma118" : "iso88597", + "elot928" : "iso88597", + + "hebrew": "iso88598", + "hebrew8": "iso88598", + + "turkish": "iso88599", + "turkish8": "iso88599", + + "thai": "iso885911", + "thai8": "iso885911", + + "celtic": "iso885914", + "celtic8": "iso885914", + "isoceltic": "iso885914", + + "tis6200": "tis620", + "tis62025291": "tis620", + "tis62025330": "tis620", + + "10000": "macroman", + "10006": "macgreek", + "10007": "maccyrillic", + "10079": "maciceland", + "10081": "macturkish", + + "cspc8codepage437": "cp437", + "cspc775baltic": "cp775", + "cspc850multilingual": "cp850", + "cspcp852": "cp852", + "cspc862latinhebrew": "cp862", + "cpgr": "cp869", + + "msee": "cp1250", + "mscyrl": "cp1251", + "msansi": "cp1252", + "msgreek": "cp1253", + "msturk": "cp1254", + "mshebr": "cp1255", + "msarab": "cp1256", + "winbaltrim": "cp1257", + + "cp20866": "koi8r", + "20866": "koi8r", + "ibm878": "koi8r", + "cskoi8r": "koi8r", + + "cp21866": "koi8u", + "21866": "koi8u", + "ibm1168": "koi8u", + + "strk10482002": "rk1048", + + "tcvn5712": "tcvn", + "tcvn57121": "tcvn", + + "gb198880": "iso646cn", + "cn": "iso646cn", + + "csiso14jisc6220ro": "iso646jp", + "jisc62201969ro": "iso646jp", + "jp": "iso646jp", + + "cshproman8": "hproman8", + "r8": "hproman8", + "roman8": "hproman8", + "xroman8": "hproman8", + "ibm1051": "hproman8", + + "mac": "macintosh", + "csmacintosh": "macintosh", +}; + diff --git a/nodejs/node_modules/iconv-lite/encodings/tables/big5-added.json b/nodejs/node_modules/iconv-lite/encodings/tables/big5-added.json new file mode 100644 index 000000000..3c3d3c2f7 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/tables/big5-added.json @@ -0,0 +1,122 @@ +[ +["8740","䏰䰲䘃䖦䕸𧉧䵷䖳𧲱䳢𧳅㮕䜶䝄䱇䱀𤊿𣘗𧍒𦺋𧃒䱗𪍑䝏䗚䲅𧱬䴇䪤䚡𦬣爥𥩔𡩣𣸆𣽡晍囻"], +["8767","綕夝𨮹㷴霴𧯯寛𡵞媤㘥𩺰嫑宷峼杮薓𩥅瑡璝㡵𡵓𣚞𦀡㻬"], +["87a1","𥣞㫵竼龗𤅡𨤍𣇪𠪊𣉞䌊蒄龖鐯䤰蘓墖靊鈘秐稲晠権袝瑌篅枂稬剏遆㓦珄𥶹瓆鿇垳䤯呌䄱𣚎堘穲𧭥讏䚮𦺈䆁𥶙箮𢒼鿈𢓁𢓉𢓌鿉蔄𣖻䂴鿊䓡𪷿拁灮鿋"], +["8840","㇀",4,"𠄌㇅𠃑𠃍㇆㇇𠃋𡿨㇈𠃊㇉㇊㇋㇌𠄎㇍㇎ĀÁǍÀĒÉĚÈŌÓǑÒ࿿Ê̄Ế࿿Ê̌ỀÊāáǎàɑēéěèīíǐìōóǒòūúǔùǖǘǚ"], +["88a1","ǜü࿿ê̄ế࿿ê̌ềêɡ⏚⏛"], +["8940","𪎩𡅅"], +["8943","攊"], +["8946","丽滝鵎釟"], +["894c","𧜵撑会伨侨兖兴农凤务动医华发变团声处备夲头学实実岚庆总斉柾栄桥济炼电纤纬纺织经统缆缷艺苏药视设询车轧轮"], +["89a1","琑糼緍楆竉刧"], +["89ab","醌碸酞肼"], +["89b0","贋胶𠧧"], +["89b5","肟黇䳍鷉鸌䰾𩷶𧀎鸊𪄳㗁"], +["89c1","溚舾甙"], +["89c5","䤑马骏龙禇𨑬𡷊𠗐𢫦两亁亀亇亿仫伷㑌侽㹈倃傈㑽㒓㒥円夅凛凼刅争剹劐匧㗇厩㕑厰㕓参吣㕭㕲㚁咓咣咴咹哐哯唘唣唨㖘唿㖥㖿嗗㗅"], +["8a40","𧶄唥"], +["8a43","𠱂𠴕𥄫喐𢳆㧬𠍁蹆𤶸𩓥䁓𨂾睺𢰸㨴䟕𨅝𦧲𤷪擝𠵼𠾴𠳕𡃴撍蹾𠺖𠰋𠽤𢲩𨉖𤓓"], +["8a64","𠵆𩩍𨃩䟴𤺧𢳂骲㩧𩗴㿭㔆𥋇𩟔𧣈𢵄鵮頕"], +["8a76","䏙𦂥撴哣𢵌𢯊𡁷㧻𡁯"], +["8aa1","𦛚𦜖𧦠擪𥁒𠱃蹨𢆡𨭌𠜱"], +["8aac","䠋𠆩㿺塳𢶍"], +["8ab2","𤗈𠓼𦂗𠽌𠶖啹䂻䎺"], +["8abb","䪴𢩦𡂝膪飵𠶜捹㧾𢝵跀嚡摼㹃"], +["8ac9","𪘁𠸉𢫏𢳉"], +["8ace","𡃈𣧂㦒㨆𨊛㕸𥹉𢃇噒𠼱𢲲𩜠㒼氽𤸻"], +["8adf","𧕴𢺋𢈈𪙛𨳍𠹺𠰴𦠜羓𡃏𢠃𢤹㗻𥇣𠺌𠾍𠺪㾓𠼰𠵇𡅏𠹌"], +["8af6","𠺫𠮩𠵈𡃀𡄽㿹𢚖搲𠾭"], +["8b40","𣏴𧘹𢯎𠵾𠵿𢱑𢱕㨘𠺘𡃇𠼮𪘲𦭐𨳒𨶙𨳊閪哌苄喹"], +["8b55","𩻃鰦骶𧝞𢷮煀腭胬尜𦕲脴㞗卟𨂽醶𠻺𠸏𠹷𠻻㗝𤷫㘉𠳖嚯𢞵𡃉𠸐𠹸𡁸𡅈𨈇𡑕𠹹𤹐𢶤婔𡀝𡀞𡃵𡃶垜𠸑"], +["8ba1","𧚔𨋍𠾵𠹻𥅾㜃𠾶𡆀𥋘𪊽𤧚𡠺𤅷𨉼墙剨㘚𥜽箲孨䠀䬬鼧䧧鰟鮍𥭴𣄽嗻㗲嚉丨夂𡯁屮靑𠂆乛亻㔾尣彑忄㣺扌攵歺氵氺灬爫丬犭𤣩罒礻糹罓𦉪㓁"], +["8bde","𦍋耂肀𦘒𦥑卝衤见𧢲讠贝钅镸长门𨸏韦页风飞饣𩠐鱼鸟黄歯龜丷𠂇阝户钢"], +["8c40","倻淾𩱳龦㷉袏𤅎灷峵䬠𥇍㕙𥴰愢𨨲辧釶熑朙玺𣊁𪄇㲋𡦀䬐磤琂冮𨜏䀉橣𪊺䈣蘏𠩯稪𩥇𨫪靕灍匤𢁾鏴盙𨧣龧矝亣俰傼丯众龨吴綋墒壐𡶶庒庙忂𢜒斋"], +["8ca1","𣏹椙橃𣱣泿"], +["8ca7","爀𤔅玌㻛𤨓嬕璹讃𥲤𥚕窓篬糃繬苸薗龩袐龪躹龫迏蕟駠鈡龬𨶹𡐿䁱䊢娚"], +["8cc9","顨杫䉶圽"], +["8cce","藖𤥻芿𧄍䲁𦵴嵻𦬕𦾾龭龮宖龯曧繛湗秊㶈䓃𣉖𢞖䎚䔶"], +["8ce6","峕𣬚諹屸㴒𣕑嵸龲煗䕘𤃬𡸣䱷㥸㑊𠆤𦱁諌侴𠈹妿腬顖𩣺弻"], +["8d40","𠮟"], +["8d42","𢇁𨥭䄂䚻𩁹㼇龳𪆵䃸㟖䛷𦱆䅼𨚲𧏿䕭㣔𥒚䕡䔛䶉䱻䵶䗪㿈𤬏㙡䓞䒽䇭崾嵈嵖㷼㠏嶤嶹㠠㠸幂庽弥徃㤈㤔㤿㥍惗愽峥㦉憷憹懏㦸戬抐拥挘㧸嚱"], +["8da1","㨃揢揻搇摚㩋擀崕嘡龟㪗斆㪽旿晓㫲暒㬢朖㭂枤栀㭘桊梄㭲㭱㭻椉楃牜楤榟榅㮼槖㯝橥橴橱檂㯬檙㯲檫檵櫔櫶殁毁毪汵沪㳋洂洆洦涁㳯涤涱渕渘温溆𨧀溻滢滚齿滨滩漤漴㵆𣽁澁澾㵪㵵熷岙㶊瀬㶑灐灔灯灿炉𠌥䏁㗱𠻘"], +["8e40","𣻗垾𦻓焾𥟠㙎榢𨯩孴穉𥣡𩓙穥穽𥦬窻窰竂竃燑𦒍䇊竚竝竪䇯咲𥰁笋筕笩𥌎𥳾箢筯莜𥮴𦱿篐萡箒箸𥴠㶭𥱥蒒篺簆簵𥳁籄粃𤢂粦晽𤕸糉糇糦籴糳糵糎"], +["8ea1","繧䔝𦹄絝𦻖璍綉綫焵綳緒𤁗𦀩緤㴓緵𡟹緥𨍭縝𦄡𦅚繮纒䌫鑬縧罀罁罇礶𦋐駡羗𦍑羣𡙡𠁨䕜𣝦䔃𨌺翺𦒉者耈耝耨耯𪂇𦳃耻耼聡𢜔䦉𦘦𣷣𦛨朥肧𨩈脇脚墰𢛶汿𦒘𤾸擧𡒊舘𡡞橓𤩥𤪕䑺舩𠬍𦩒𣵾俹𡓽蓢荢𦬊𤦧𣔰𡝳𣷸芪椛芳䇛"], +["8f40","蕋苐茚𠸖𡞴㛁𣅽𣕚艻苢茘𣺋𦶣𦬅𦮗𣗎㶿茝嗬莅䔋𦶥莬菁菓㑾𦻔橗蕚㒖𦹂𢻯葘𥯤葱㷓䓤檧葊𣲵祘蒨𦮖𦹷𦹃蓞萏莑䒠蒓蓤𥲑䉀𥳀䕃蔴嫲𦺙䔧蕳䔖枿蘖"], +["8fa1","𨘥𨘻藁𧂈蘂𡖂𧃍䕫䕪蘨㙈𡢢号𧎚虾蝱𪃸蟮𢰧螱蟚蠏噡虬桖䘏衅衆𧗠𣶹𧗤衞袜䙛袴袵揁装睷𧜏覇覊覦覩覧覼𨨥觧𧤤𧪽誜瞓釾誐𧩙竩𧬺𣾏䜓𧬸煼謌謟𥐰𥕥謿譌譍誩𤩺讐讛誯𡛟䘕衏貛𧵔𧶏貫㜥𧵓賖𧶘𧶽贒贃𡤐賛灜贑𤳉㻐起"], +["9040","趩𨀂𡀔𤦊㭼𨆼𧄌竧躭躶軃鋔輙輭𨍥𨐒辥錃𪊟𠩐辳䤪𨧞𨔽𣶻廸𣉢迹𪀔𨚼𨔁𢌥㦀𦻗逷𨔼𧪾遡𨕬𨘋邨𨜓郄𨛦邮都酧㫰醩釄粬𨤳𡺉鈎沟鉁鉢𥖹銹𨫆𣲛𨬌𥗛"], +["90a1","𠴱錬鍫𨫡𨯫炏嫃𨫢𨫥䥥鉄𨯬𨰹𨯿鍳鑛躼閅閦鐦閠濶䊹𢙺𨛘𡉼𣸮䧟氜陻隖䅬隣𦻕懚隶磵𨫠隽双䦡𦲸𠉴𦐐𩂯𩃥𤫑𡤕𣌊霱虂霶䨏䔽䖅𤫩灵孁霛靜𩇕靗孊𩇫靟鐥僐𣂷𣂼鞉鞟鞱鞾韀韒韠𥑬韮琜𩐳響韵𩐝𧥺䫑頴頳顋顦㬎𧅵㵑𠘰𤅜"], +["9140","𥜆飊颷飈飇䫿𦴧𡛓喰飡飦飬鍸餹𤨩䭲𩡗𩤅駵騌騻騐驘𥜥㛄𩂱𩯕髠髢𩬅髴䰎鬔鬭𨘀倴鬴𦦨㣃𣁽魐魀𩴾婅𡡣鮎𤉋鰂鯿鰌𩹨鷔𩾷𪆒𪆫𪃡𪄣𪇟鵾鶃𪄴鸎梈"], +["91a1","鷄𢅛𪆓𪈠𡤻𪈳鴹𪂹𪊴麐麕麞麢䴴麪麯𤍤黁㭠㧥㴝伲㞾𨰫鼂鼈䮖鐤𦶢鼗鼖鼹嚟嚊齅馸𩂋韲葿齢齩竜龎爖䮾𤥵𤦻煷𤧸𤍈𤩑玞𨯚𡣺禟𨥾𨸶鍩鏳𨩄鋬鎁鏋𨥬𤒹爗㻫睲穃烐𤑳𤏸煾𡟯炣𡢾𣖙㻇𡢅𥐯𡟸㜢𡛻𡠹㛡𡝴𡣑𥽋㜣𡛀坛𤨥𡏾𡊨"], +["9240","𡏆𡒶蔃𣚦蔃葕𤦔𧅥𣸱𥕜𣻻𧁒䓴𣛮𩦝𦼦柹㜳㰕㷧塬𡤢栐䁗𣜿𤃡𤂋𤄏𦰡哋嚞𦚱嚒𠿟𠮨𠸍鏆𨬓鎜仸儫㠙𤐶亼𠑥𠍿佋侊𥙑婨𠆫𠏋㦙𠌊𠐔㐵伩𠋀𨺳𠉵諚𠈌亘"], +["92a1","働儍侢伃𤨎𣺊佂倮偬傁俌俥偘僼兙兛兝兞湶𣖕𣸹𣺿浲𡢄𣺉冨凃𠗠䓝𠒣𠒒𠒑赺𨪜𠜎剙劤𠡳勡鍮䙺熌𤎌𠰠𤦬𡃤槑𠸝瑹㻞璙琔瑖玘䮎𤪼𤂍叐㖄爏𤃉喴𠍅响𠯆圝鉝雴鍦埝垍坿㘾壋媙𨩆𡛺𡝯𡜐娬妸銏婾嫏娒𥥆𡧳𡡡𤊕㛵洅瑃娡𥺃"], +["9340","媁𨯗𠐓鏠璌𡌃焅䥲鐈𨧻鎽㞠尞岞幞幈𡦖𡥼𣫮廍孏𡤃𡤄㜁𡢠㛝𡛾㛓脪𨩇𡶺𣑲𨦨弌弎𡤧𡞫婫𡜻孄蘔𧗽衠恾𢡠𢘫忛㺸𢖯𢖾𩂈𦽳懀𠀾𠁆𢘛憙憘恵𢲛𢴇𤛔𩅍"], +["93a1","摱𤙥𢭪㨩𢬢𣑐𩣪𢹸挷𪑛撶挱揑𤧣𢵧护𢲡搻敫楲㯴𣂎𣊭𤦉𣊫唍𣋠𡣙𩐿曎𣊉𣆳㫠䆐𥖄𨬢𥖏𡛼𥕛𥐥磮𣄃𡠪𣈴㑤𣈏𣆂𤋉暎𦴤晫䮓昰𧡰𡷫晣𣋒𣋡昞𥡲㣑𣠺𣞼㮙𣞢𣏾瓐㮖枏𤘪梶栞㯄檾㡣𣟕𤒇樳橒櫉欅𡤒攑梘橌㯗橺歗𣿀𣲚鎠鋲𨯪𨫋"], +["9440","銉𨀞𨧜鑧涥漋𤧬浧𣽿㶏渄𤀼娽渊塇洤硂焻𤌚𤉶烱牐犇犔𤞏𤜥兹𤪤𠗫瑺𣻸𣙟𤩊𤤗𥿡㼆㺱𤫟𨰣𣼵悧㻳瓌琼鎇琷䒟𦷪䕑疃㽣𤳙𤴆㽘畕癳𪗆㬙瑨𨫌𤦫𤦎㫻"], +["94a1","㷍𤩎㻿𤧅𤣳釺圲鍂𨫣𡡤僟𥈡𥇧睸𣈲眎眏睻𤚗𣞁㩞𤣰琸璛㺿𤪺𤫇䃈𤪖𦆮錇𥖁砞碍碈磒珐祙𧝁𥛣䄎禛蒖禥樭𣻺稺秴䅮𡛦䄲鈵秱𠵌𤦌𠊙𣶺𡝮㖗啫㕰㚪𠇔𠰍竢婙𢛵𥪯𥪜娍𠉛磰娪𥯆竾䇹籝籭䈑𥮳𥺼𥺦糍𤧹𡞰粎籼粮檲緜縇緓罎𦉡"], +["9540","𦅜𧭈綗𥺂䉪𦭵𠤖柖𠁎𣗏埄𦐒𦏸𤥢翝笧𠠬𥫩𥵃笌𥸎駦虅驣樜𣐿㧢𤧷𦖭騟𦖠蒀𧄧𦳑䓪脷䐂胆脉腂𦞴飃𦩂艢艥𦩑葓𦶧蘐𧈛媆䅿𡡀嬫𡢡嫤𡣘蚠蜨𣶏蠭𧐢娂"], +["95a1","衮佅袇袿裦襥襍𥚃襔𧞅𧞄𨯵𨯙𨮜𨧹㺭蒣䛵䛏㟲訽訜𩑈彍鈫𤊄旔焩烄𡡅鵭貟賩𧷜妚矃姰䍮㛔踪躧𤰉輰轊䋴汘澻𢌡䢛潹溋𡟚鯩㚵𤤯邻邗啱䤆醻鐄𨩋䁢𨫼鐧𨰝𨰻蓥訫閙閧閗閖𨴴瑅㻂𤣿𤩂𤏪㻧𣈥随𨻧𨹦𨹥㻌𤧭𤩸𣿮琒瑫㻼靁𩂰"], +["9640","桇䨝𩂓𥟟靝鍨𨦉𨰦𨬯𦎾銺嬑譩䤼珹𤈛鞛靱餸𠼦巁𨯅𤪲頟𩓚鋶𩗗釥䓀𨭐𤩧𨭤飜𨩅㼀鈪䤥萔餻饍𧬆㷽馛䭯馪驜𨭥𥣈檏騡嫾騯𩣱䮐𩥈馼䮽䮗鍽塲𡌂堢𤦸"], +["96a1","𡓨硄𢜟𣶸棅㵽鑘㤧慐𢞁𢥫愇鱏鱓鱻鰵鰐魿鯏𩸭鮟𪇵𪃾鴡䲮𤄄鸘䲰鴌𪆴𪃭𪃳𩤯鶥蒽𦸒𦿟𦮂藼䔳𦶤𦺄𦷰萠藮𦸀𣟗𦁤秢𣖜𣙀䤭𤧞㵢鏛銾鍈𠊿碹鉷鑍俤㑀遤𥕝砽硔碶硋𡝗𣇉𤥁㚚佲濚濙瀞瀞吔𤆵垻壳垊鴖埗焴㒯𤆬燫𦱀𤾗嬨𡞵𨩉"], +["9740","愌嫎娋䊼𤒈㜬䭻𨧼鎻鎸𡣖𠼝葲𦳀𡐓𤋺𢰦𤏁妔𣶷𦝁綨𦅛𦂤𤦹𤦋𨧺鋥珢㻩璴𨭣𡢟㻡𤪳櫘珳珻㻖𤨾𤪔𡟙𤩦𠎧𡐤𤧥瑈𤤖炥𤥶銄珦鍟𠓾錱𨫎𨨖鎆𨯧𥗕䤵𨪂煫"], +["97a1","𤥃𠳿嚤𠘚𠯫𠲸唂秄𡟺緾𡛂𤩐𡡒䔮鐁㜊𨫀𤦭妰𡢿𡢃𧒄媡㛢𣵛㚰鉟婹𨪁𡡢鍴㳍𠪴䪖㦊僴㵩㵌𡎜煵䋻𨈘渏𩃤䓫浗𧹏灧沯㳖𣿭𣸭渂漌㵯𠏵畑㚼㓈䚀㻚䡱姄鉮䤾轁𨰜𦯀堒埈㛖𡑒烾𤍢𤩱𢿣𡊰𢎽梹楧𡎘𣓥𧯴𣛟𨪃𣟖𣏺𤲟樚𣚭𦲷萾䓟䓎"], +["9840","𦴦𦵑𦲂𦿞漗𧄉茽𡜺菭𦲀𧁓𡟛妉媂𡞳婡婱𡤅𤇼㜭姯𡜼㛇熎鎐暚𤊥婮娫𤊓樫𣻹𧜶𤑛𤋊焝𤉙𨧡侰𦴨峂𤓎𧹍𤎽樌𤉖𡌄炦焳𤏩㶥泟勇𤩏繥姫崯㷳彜𤩝𡟟綤萦"], +["98a1","咅𣫺𣌀𠈔坾𠣕𠘙㿥𡾞𪊶瀃𩅛嵰玏糓𨩙𩐠俈翧狍猐𧫴猸猹𥛶獁獈㺩𧬘遬燵𤣲珡臶㻊県㻑沢国琙琞琟㻢㻰㻴㻺瓓㼎㽓畂畭畲疍㽼痈痜㿀癍㿗癴㿜発𤽜熈嘣覀塩䀝睃䀹条䁅㗛瞘䁪䁯属瞾矋売砘点砜䂨砹硇硑硦葈𥔵礳栃礲䄃"], +["9940","䄉禑禙辻稆込䅧窑䆲窼艹䇄竏竛䇏両筢筬筻簒簛䉠䉺类粜䊌粸䊔糭输烀𠳏総緔緐緽羮羴犟䎗耠耥笹耮耱联㷌垴炠肷胩䏭脌猪脎脒畠脔䐁㬹腖腙腚"], +["99a1","䐓堺腼膄䐥膓䐭膥埯臁臤艔䒏芦艶苊苘苿䒰荗险榊萅烵葤惣蒈䔄蒾蓡蓸蔐蔸蕒䔻蕯蕰藠䕷虲蚒蚲蛯际螋䘆䘗袮裿褤襇覑𧥧訩訸誔誴豑賔賲贜䞘塟跃䟭仮踺嗘坔蹱嗵躰䠷軎転軤軭軲辷迁迊迌逳駄䢭飠鈓䤞鈨鉘鉫銱銮銿"], +["9a40","鋣鋫鋳鋴鋽鍃鎄鎭䥅䥑麿鐗匁鐝鐭鐾䥪鑔鑹锭関䦧间阳䧥枠䨤靀䨵鞲韂噔䫤惨颹䬙飱塄餎餙冴餜餷饂饝饢䭰駅䮝騼鬏窃魩鮁鯝鯱鯴䱭鰠㝯𡯂鵉鰺"], +["9aa1","黾噐鶓鶽鷀鷼银辶鹻麬麱麽黆铜黢黱黸竈齄𠂔𠊷𠎠椚铃妬𠓗塀铁㞹𠗕𠘕𠙶𡚺块煳𠫂𠫍𠮿呪吆𠯋咞𠯻𠰻𠱓𠱥𠱼惧𠲍噺𠲵𠳝𠳭𠵯𠶲𠷈楕鰯螥𠸄𠸎𠻗𠾐𠼭𠹳尠𠾼帋𡁜𡁏𡁶朞𡁻𡂈𡂖㙇𡂿𡃓𡄯𡄻卤蒭𡋣𡍵𡌶讁𡕷𡘙𡟃𡟇乸炻𡠭𡥪"], +["9b40","𡨭𡩅𡰪𡱰𡲬𡻈拃𡻕𡼕熘桕𢁅槩㛈𢉼𢏗𢏺𢜪𢡱𢥏苽𢥧𢦓𢫕覥𢫨辠𢬎鞸𢬿顇骽𢱌"], +["9b62","𢲈𢲷𥯨𢴈𢴒𢶷𢶕𢹂𢽴𢿌𣀳𣁦𣌟𣏞徱晈暿𧩹𣕧𣗳爁𤦺矗𣘚𣜖纇𠍆墵朎"], +["9ba1","椘𣪧𧙗𥿢𣸑𣺹𧗾𢂚䣐䪸𤄙𨪚𤋮𤌍𤀻𤌴𤎖𤩅𠗊凒𠘑妟𡺨㮾𣳿𤐄𤓖垈𤙴㦛𤜯𨗨𩧉㝢𢇃譞𨭎駖𤠒𤣻𤨕爉𤫀𠱸奥𤺥𤾆𠝹軚𥀬劏圿煱𥊙𥐙𣽊𤪧喼𥑆𥑮𦭒釔㑳𥔿𧘲𥕞䜘𥕢𥕦𥟇𤤿𥡝偦㓻𣏌惞𥤃䝼𨥈𥪮𥮉𥰆𡶐垡煑澶𦄂𧰒遖𦆲𤾚譢𦐂𦑊"], +["9c40","嵛𦯷輶𦒄𡤜諪𤧶𦒈𣿯𦔒䯀𦖿𦚵𢜛鑥𥟡憕娧晉侻嚹𤔡𦛼乪𤤴陖涏𦲽㘘襷𦞙𦡮𦐑𦡞營𦣇筂𩃀𠨑𦤦鄄𦤹穅鷰𦧺騦𦨭㙟𦑩𠀡禃𦨴𦭛崬𣔙菏𦮝䛐𦲤画补𦶮墶"], +["9ca1","㜜𢖍𧁋𧇍㱔𧊀𧊅銁𢅺𧊋錰𧋦𤧐氹钟𧑐𠻸蠧裵𢤦𨑳𡞱溸𤨪𡠠㦤㚹尐秣䔿暶𩲭𩢤襃𧟌𧡘囖䃟𡘊㦡𣜯𨃨𡏅熭荦𧧝𩆨婧䲷𧂯𨦫𧧽𧨊𧬋𧵦𤅺筃祾𨀉澵𪋟樃𨌘厢𦸇鎿栶靝𨅯𨀣𦦵𡏭𣈯𨁈嶅𨰰𨂃圕頣𨥉嶫𤦈斾槕叒𤪥𣾁㰑朶𨂐𨃴𨄮𡾡𨅏"], +["9d40","𨆉𨆯𨈚𨌆𨌯𨎊㗊𨑨𨚪䣺揦𨥖砈鉕𨦸䏲𨧧䏟𨧨𨭆𨯔姸𨰉輋𨿅𩃬筑𩄐𩄼㷷𩅞𤫊运犏嚋𩓧𩗩𩖰𩖸𩜲𩣑𩥉𩥪𩧃𩨨𩬎𩵚𩶛纟𩻸𩼣䲤镇𪊓熢𪋿䶑递𪗋䶜𠲜达嗁"], +["9da1","辺𢒰边𤪓䔉繿潖檱仪㓤𨬬𧢝㜺躀𡟵𨀤𨭬𨮙𧨾𦚯㷫𧙕𣲷𥘵𥥖亚𥺁𦉘嚿𠹭踎孭𣺈𤲞揞拐𡟶𡡻攰嘭𥱊吚𥌑㷆𩶘䱽嘢嘞罉𥻘奵𣵀蝰东𠿪𠵉𣚺脗鵞贘瘻鱅癎瞹鍅吲腈苷嘥脲萘肽嗪祢噃吖𠺝㗎嘅嗱曱𨋢㘭甴嗰喺咗啲𠱁𠲖廐𥅈𠹶𢱢"], +["9e40","𠺢麫絚嗞𡁵抝靭咔賍燶酶揼掹揾啩𢭃鱲𢺳冚㓟𠶧冧呍唞唓癦踭𦢊疱肶蠄螆裇膶萜𡃁䓬猄𤜆宐茋𦢓噻𢛴𧴯𤆣𧵳𦻐𧊶酰𡇙鈈𣳼𪚩𠺬𠻹牦𡲢䝎𤿂𧿹𠿫䃺"], +["9ea1","鱝攟𢶠䣳𤟠𩵼𠿬𠸊恢𧖣𠿭"], +["9ead","𦁈𡆇熣纎鵐业丄㕷嬍沲卧㚬㧜卽㚥𤘘墚𤭮舭呋垪𥪕𠥹"], +["9ec5","㩒𢑥獴𩺬䴉鯭𣳾𩼰䱛𤾩𩖞𩿞葜𣶶𧊲𦞳𣜠挮紥𣻷𣸬㨪逈勌㹴㙺䗩𠒎癀嫰𠺶硺𧼮墧䂿噼鮋嵴癔𪐴麅䳡痹㟻愙𣃚𤏲"], +["9ef5","噝𡊩垧𤥣𩸆刴𧂮㖭汊鵼"], +["9f40","籖鬹埞𡝬屓擓𩓐𦌵𧅤蚭𠴨𦴢𤫢𠵱"], +["9f4f","凾𡼏嶎霃𡷑麁遌笟鬂峑箣扨挵髿篏鬪籾鬮籂粆鰕篼鬉鼗鰛𤤾齚啳寃俽麘俲剠㸆勑坧偖妷帒韈鶫轜呩鞴饀鞺匬愰"], +["9fa1","椬叚鰊鴂䰻陁榀傦畆𡝭駚剳"], +["9fae","酙隁酜"], +["9fb2","酑𨺗捿𦴣櫊嘑醎畺抅𠏼獏籰𥰡𣳽"], +["9fc1","𤤙盖鮝个𠳔莾衂"], +["9fc9","届槀僭坺刟巵从氱𠇲伹咜哚劚趂㗾弌㗳"], +["9fdb","歒酼龥鮗頮颴骺麨麄煺笔"], +["9fe7","毺蠘罸"], +["9feb","嘠𪙊蹷齓"], +["9ff0","跔蹏鸜踁抂𨍽踨蹵竓𤩷稾磘泪詧瘇"], +["a040","𨩚鼦泎蟖痃𪊲硓咢贌狢獱謭猂瓱賫𤪻蘯徺袠䒷"], +["a055","𡠻𦸅"], +["a058","詾𢔛"], +["a05b","惽癧髗鵄鍮鮏蟵"], +["a063","蠏賷猬霡鮰㗖犲䰇籑饊𦅙慙䰄麖慽"], +["a073","坟慯抦戹拎㩜懢厪𣏵捤栂㗒"], +["a0a1","嵗𨯂迚𨸹"], +["a0a6","僙𡵆礆匲阸𠼻䁥"], +["a0ae","矾"], +["a0b0","糂𥼚糚稭聦聣絍甅瓲覔舚朌聢𧒆聛瓰脃眤覉𦟌畓𦻑螩蟎臈螌詉貭譃眫瓸蓚㘵榲趦"], +["a0d4","覩瑨涹蟁𤀑瓧㷛煶悤憜㳑煢恷"], +["a0e2","罱𨬭牐惩䭾删㰘𣳇𥻗𧙖𥔱𡥄𡋾𩤃𦷜𧂭峁𦆭𨨏𣙷𠃮𦡆𤼎䕢嬟𦍌齐麦𦉫"], +["a3c0","␀",31,"␡"], +["c6a1","①",9,"⑴",9,"ⅰ",9,"丶丿亅亠冂冖冫勹匸卩厶夊宀巛⼳广廴彐彡攴无疒癶辵隶¨ˆヽヾゝゞ〃仝々〆〇ー［］✽ぁ",23], +["c740","す",58,"ァアィイ"], +["c7a1","ゥ",81,"А",5,"ЁЖ",4], +["c840","Л",26,"ёж",25,"⇧↸↹㇏𠃌乚𠂊刂䒑"], +["c8a1","龰冈龱𧘇"], +["c8cd","￢￤＇＂㈱№℡゛゜⺀⺄⺆⺇⺈⺊⺌⺍⺕⺜⺝⺥⺧⺪⺬⺮⺶⺼⺾⻆⻊⻌⻍⻏⻖⻗⻞⻣"], +["c8f5","ʃɐɛɔɵœøŋʊɪ"], +["f9fe","￭"], +["fa40","𠕇鋛𠗟𣿅蕌䊵珯况㙉𤥂𨧤鍄𡧛苮𣳈砼杄拟𤤳𨦪𠊠𦮳𡌅侫𢓭倈𦴩𧪄𣘀𤪱𢔓倩𠍾徤𠎀𠍇滛𠐟偽儁㑺儎顬㝃萖𤦤𠒇兠𣎴兪𠯿𢃼𠋥𢔰𠖎𣈳𡦃宂蝽𠖳𣲙冲冸"], +["faa1","鴴凉减凑㳜凓𤪦决凢卂凭菍椾𣜭彻刋刦刼劵剗劔効勅簕蕂勠蘍𦬓包𨫞啉滙𣾀𠥔𣿬匳卄𠯢泋𡜦栛珕恊㺪㣌𡛨燝䒢卭却𨚫卾卿𡖖𡘓矦厓𨪛厠厫厮玧𥝲㽙玜叁叅汉义埾叙㪫𠮏叠𣿫𢶣叶𠱷吓灹唫晗浛呭𦭓𠵴啝咏咤䞦𡜍𠻝㶴𠵍"], +["fb40","𨦼𢚘啇䳭启琗喆喩嘅𡣗𤀺䕒𤐵暳𡂴嘷曍𣊊暤暭噍噏磱囱鞇叾圀囯园𨭦㘣𡉏坆𤆥汮炋坂㚱𦱾埦𡐖堃𡑔𤍣堦𤯵塜墪㕡壠壜𡈼壻寿坃𪅐𤉸鏓㖡够梦㛃湙"], +["fba1","𡘾娤啓𡚒蔅姉𠵎𦲁𦴪𡟜姙𡟻𡞲𦶦浱𡠨𡛕姹𦹅媫婣㛦𤦩婷㜈媖瑥嫓𦾡𢕔㶅𡤑㜲𡚸広勐孶斈孼𧨎䀄䡝𠈄寕慠𡨴𥧌𠖥寳宝䴐尅𡭄尓珎尔𡲥𦬨屉䣝岅峩峯嶋𡷹𡸷崐崘嵆𡺤岺巗苼㠭𤤁𢁉𢅳芇㠶㯂帮檊幵幺𤒼𠳓厦亷廐厨𡝱帉廴𨒂"], +["fc40","廹廻㢠廼栾鐛弍𠇁弢㫞䢮𡌺强𦢈𢏐彘𢑱彣鞽𦹮彲鍀𨨶徧嶶㵟𥉐𡽪𧃸𢙨釖𠊞𨨩怱暅𡡷㥣㷇㘹垐𢞴祱㹀悞悤悳𤦂𤦏𧩓璤僡媠慤萤慂慈𦻒憁凴𠙖憇宪𣾷"], +["fca1","𢡟懓𨮝𩥝懐㤲𢦀𢣁怣慜攞掋𠄘担𡝰拕𢸍捬𤧟㨗搸揸𡎎𡟼撐澊𢸶頔𤂌𥜝擡擥鑻㩦携㩗敍漖𤨨𤨣斅敭敟𣁾斵𤥀䬷旑䃘𡠩无旣忟𣐀昘𣇷𣇸晄𣆤𣆥晋𠹵晧𥇦晳晴𡸽𣈱𨗴𣇈𥌓矅𢣷馤朂𤎜𤨡㬫槺𣟂杞杧杢𤇍𩃭柗䓩栢湐鈼栁𣏦𦶠桝"], +["fd40","𣑯槡樋𨫟楳棃𣗍椁椀㴲㨁𣘼㮀枬楡𨩊䋼椶榘㮡𠏉荣傐槹𣙙𢄪橅𣜃檝㯳枱櫈𩆜㰍欝𠤣惞欵歴𢟍溵𣫛𠎵𡥘㝀吡𣭚毡𣻼毜氷𢒋𤣱𦭑汚舦汹𣶼䓅𣶽𤆤𤤌𤤀"], +["fda1","𣳉㛥㳫𠴲鮃𣇹𢒑羏样𦴥𦶡𦷫涖浜湼漄𤥿𤂅𦹲蔳𦽴凇沜渝萮𨬡港𣸯瑓𣾂秌湏媑𣁋濸㜍澝𣸰滺𡒗𤀽䕕鏰潄潜㵎潴𩅰㴻澟𤅄濓𤂑𤅕𤀹𣿰𣾴𤄿凟𤅖𤅗𤅀𦇝灋灾炧炁烌烕烖烟䄄㷨熴熖𤉷焫煅媈煊煮岜𤍥煏鍢𤋁焬𤑚𤨧𤨢熺𨯨炽爎"], +["fe40","鑂爕夑鑃爤鍁𥘅爮牀𤥴梽牕牗㹕𣁄栍漽犂猪猫𤠣𨠫䣭𨠄猨献珏玪𠰺𦨮珉瑉𤇢𡛧𤨤昣㛅𤦷𤦍𤧻珷琕椃𤨦琹𠗃㻗瑜𢢭瑠𨺲瑇珤瑶莹瑬㜰瑴鏱樬璂䥓𤪌"], +["fea1","𤅟𤩹𨮏孆𨰃𡢞瓈𡦈甎瓩甞𨻙𡩋寗𨺬鎅畍畊畧畮𤾂㼄𤴓疎瑝疞疴瘂瘬癑癏癯癶𦏵皐臯㟸𦤑𦤎皡皥皷盌𦾟葢𥂝𥅽𡸜眞眦着撯𥈠睘𣊬瞯𨥤𨥨𡛁矴砉𡍶𤨒棊碯磇磓隥礮𥗠磗礴碱𧘌辸袄𨬫𦂃𢘜禆褀椂禀𥡗禝𧬹礼禩渪𧄦㺨秆𩄍秔"] +] diff --git a/nodejs/node_modules/iconv-lite/encodings/tables/cp936.json b/nodejs/node_modules/iconv-lite/encodings/tables/cp936.json new file mode 100644 index 000000000..49ddb9a1d --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/tables/cp936.json @@ -0,0 +1,264 @@ +[ +["0","\u0000",127,"€"], +["8140","丂丄丅丆丏丒丗丟丠両丣並丩丮丯丱丳丵丷丼乀乁乂乄乆乊乑乕乗乚乛乢乣乤乥乧乨乪",5,"乲乴",9,"乿",6,"亇亊"], +["8180","亐亖亗亙亜亝亞亣亪亯亰亱亴亶亷亸亹亼亽亾仈仌仏仐仒仚仛仜仠仢仦仧仩仭仮仯仱仴仸仹仺仼仾伀伂",6,"伋伌伒",4,"伜伝伡伣伨伩伬伭伮伱伳伵伷伹伻伾",4,"佄佅佇",5,"佒佔佖佡佢佦佨佪佫佭佮佱佲併佷佸佹佺佽侀侁侂侅來侇侊侌侎侐侒侓侕侖侘侙侚侜侞侟価侢"], +["8240","侤侫侭侰",4,"侶",8,"俀俁係俆俇俈俉俋俌俍俒",4,"俙俛俠俢俤俥俧俫俬俰俲俴俵俶俷俹俻俼俽俿",11], +["8280","個倎倐們倓倕倖倗倛倝倞倠倢倣値倧倫倯",10,"倻倽倿偀偁偂偄偅偆偉偊偋偍偐",4,"偖偗偘偙偛偝",7,"偦",5,"偭",8,"偸偹偺偼偽傁傂傃傄傆傇傉傊傋傌傎",20,"傤傦傪傫傭",4,"傳",6,"傼"], +["8340","傽",17,"僐",5,"僗僘僙僛",10,"僨僩僪僫僯僰僱僲僴僶",4,"僼",9,"儈"], +["8380","儉儊儌",5,"儓",13,"儢",28,"兂兇兊兌兎兏児兒兓兗兘兙兛兝",4,"兣兤兦內兩兪兯兲兺兾兿冃冄円冇冊冋冎冏冐冑冓冔冘冚冝冞冟冡冣冦",4,"冭冮冴冸冹冺冾冿凁凂凃凅凈凊凍凎凐凒",5], +["8440","凘凙凚凜凞凟凢凣凥",5,"凬凮凱凲凴凷凾刄刅刉刋刌刏刐刓刔刕刜刞刟刡刢刣別刦刧刪刬刯刱刲刴刵刼刾剄",5,"剋剎剏剒剓剕剗剘"], +["8480","剙剚剛剝剟剠剢剣剤剦剨剫剬剭剮剰剱剳",9,"剾劀劃",4,"劉",6,"劑劒劔",6,"劜劤劥劦劧劮劯劰労",9,"勀勁勂勄勅勆勈勊勌勍勎勏勑勓勔動勗務",5,"勠勡勢勣勥",10,"勱",7,"勻勼勽匁匂匃匄匇匉匊匋匌匎"], +["8540","匑匒匓匔匘匛匜匞匟匢匤匥匧匨匩匫匬匭匯",9,"匼匽區卂卄卆卋卌卍卐協単卙卛卝卥卨卪卬卭卲卶卹卻卼卽卾厀厁厃厇厈厊厎厏"], +["8580","厐",4,"厖厗厙厛厜厞厠厡厤厧厪厫厬厭厯",6,"厷厸厹厺厼厽厾叀參",4,"収叏叐叒叓叕叚叜叝叞叡叢叧叴叺叾叿吀吂吅吇吋吔吘吙吚吜吢吤吥吪吰吳吶吷吺吽吿呁呂呄呅呇呉呌呍呎呏呑呚呝",4,"呣呥呧呩",7,"呴呹呺呾呿咁咃咅咇咈咉咊咍咑咓咗咘咜咞咟咠咡"], +["8640","咢咥咮咰咲咵咶咷咹咺咼咾哃哅哊哋哖哘哛哠",4,"哫哬哯哰哱哴",5,"哻哾唀唂唃唄唅唈唊",4,"唒唓唕",5,"唜唝唞唟唡唥唦"], +["8680","唨唩唫唭唲唴唵唶唸唹唺唻唽啀啂啅啇啈啋",4,"啑啒啓啔啗",4,"啝啞啟啠啢啣啨啩啫啯",5,"啹啺啽啿喅喆喌喍喎喐喒喓喕喖喗喚喛喞喠",6,"喨",8,"喲喴営喸喺喼喿",4,"嗆嗇嗈嗊嗋嗎嗏嗐嗕嗗",4,"嗞嗠嗢嗧嗩嗭嗮嗰嗱嗴嗶嗸",4,"嗿嘂嘃嘄嘅"], +["8740","嘆嘇嘊嘋嘍嘐",7,"嘙嘚嘜嘝嘠嘡嘢嘥嘦嘨嘩嘪嘫嘮嘯嘰嘳嘵嘷嘸嘺嘼嘽嘾噀",11,"噏",4,"噕噖噚噛噝",4], +["8780","噣噥噦噧噭噮噯噰噲噳噴噵噷噸噹噺噽",7,"嚇",6,"嚐嚑嚒嚔",14,"嚤",10,"嚰",6,"嚸嚹嚺嚻嚽",12,"囋",8,"囕囖囘囙囜団囥",5,"囬囮囯囲図囶囷囸囻囼圀圁圂圅圇國",6], +["8840","園",9,"圝圞圠圡圢圤圥圦圧圫圱圲圴",4,"圼圽圿坁坃坄坅坆坈坉坋坒",4,"坘坙坢坣坥坧坬坮坰坱坲坴坵坸坹坺坽坾坿垀"], +["8880","垁垇垈垉垊垍",4,"垔",6,"垜垝垞垟垥垨垪垬垯垰垱垳垵垶垷垹",8,"埄",6,"埌埍埐埑埓埖埗埛埜埞埡埢埣埥",7,"埮埰埱埲埳埵埶執埻埼埾埿堁堃堄堅堈堉堊堌堎堏堐堒堓堔堖堗堘堚堛堜堝堟堢堣堥",4,"堫",4,"報堲堳場堶",7], +["8940","堾",5,"塅",6,"塎塏塐塒塓塕塖塗塙",4,"塟",5,"塦",4,"塭",16,"塿墂墄墆墇墈墊墋墌"], +["8980","墍",4,"墔",4,"墛墜墝墠",7,"墪",17,"墽墾墿壀壂壃壄壆",10,"壒壓壔壖",13,"壥",5,"壭壯壱売壴壵壷壸壺",7,"夃夅夆夈",4,"夎夐夑夒夓夗夘夛夝夞夠夡夢夣夦夨夬夰夲夳夵夶夻"], +["8a40","夽夾夿奀奃奅奆奊奌奍奐奒奓奙奛",4,"奡奣奤奦",12,"奵奷奺奻奼奾奿妀妅妉妋妌妎妏妐妑妔妕妘妚妛妜妝妟妠妡妢妦"], +["8a80","妧妬妭妰妱妳",5,"妺妼妽妿",6,"姇姈姉姌姍姎姏姕姖姙姛姞",4,"姤姦姧姩姪姫姭",11,"姺姼姽姾娀娂娊娋娍娎娏娐娒娔娕娖娗娙娚娛娝娞娡娢娤娦娧娨娪",6,"娳娵娷",4,"娽娾娿婁",4,"婇婈婋",9,"婖婗婘婙婛",5], +["8b40","婡婣婤婥婦婨婩婫",8,"婸婹婻婼婽婾媀",17,"媓",6,"媜",13,"媫媬"], +["8b80","媭",4,"媴媶媷媹",4,"媿嫀嫃",5,"嫊嫋嫍",4,"嫓嫕嫗嫙嫚嫛嫝嫞嫟嫢嫤嫥嫧嫨嫪嫬",4,"嫲",22,"嬊",11,"嬘",25,"嬳嬵嬶嬸",7,"孁",6], +["8c40","孈",7,"孒孖孞孠孡孧孨孫孭孮孯孲孴孶孷學孹孻孼孾孿宂宆宊宍宎宐宑宒宔宖実宧宨宩宬宭宮宯宱宲宷宺宻宼寀寁寃寈寉寊寋寍寎寏"], +["8c80","寑寔",8,"寠寢寣實寧審",4,"寯寱",6,"寽対尀専尃尅將專尋尌對導尐尒尓尗尙尛尞尟尠尡尣尦尨尩尪尫尭尮尯尰尲尳尵尶尷屃屄屆屇屌屍屒屓屔屖屗屘屚屛屜屝屟屢層屧",6,"屰屲",6,"屻屼屽屾岀岃",4,"岉岊岋岎岏岒岓岕岝",4,"岤",4], +["8d40","岪岮岯岰岲岴岶岹岺岻岼岾峀峂峃峅",5,"峌",5,"峓",5,"峚",6,"峢峣峧峩峫峬峮峯峱",9,"峼",4], +["8d80","崁崄崅崈",5,"崏",4,"崕崗崘崙崚崜崝崟",4,"崥崨崪崫崬崯",4,"崵",7,"崿",7,"嵈嵉嵍",10,"嵙嵚嵜嵞",10,"嵪嵭嵮嵰嵱嵲嵳嵵",12,"嶃",21,"嶚嶛嶜嶞嶟嶠"], +["8e40","嶡",21,"嶸",12,"巆",6,"巎",12,"巜巟巠巣巤巪巬巭"], +["8e80","巰巵巶巸",4,"巿帀帄帇帉帊帋帍帎帒帓帗帞",7,"帨",4,"帯帰帲",4,"帹帺帾帿幀幁幃幆",5,"幍",6,"幖",4,"幜幝幟幠幣",14,"幵幷幹幾庁庂広庅庈庉庌庍庎庒庘庛庝庡庢庣庤庨",4,"庮",4,"庴庺庻庼庽庿",6], +["8f40","廆廇廈廋",5,"廔廕廗廘廙廚廜",11,"廩廫",8,"廵廸廹廻廼廽弅弆弇弉弌弍弎弐弒弔弖弙弚弜弝弞弡弢弣弤"], +["8f80","弨弫弬弮弰弲",6,"弻弽弾弿彁",14,"彑彔彙彚彛彜彞彟彠彣彥彧彨彫彮彯彲彴彵彶彸彺彽彾彿徃徆徍徎徏徑従徔徖徚徛徝從徟徠徢",5,"復徫徬徯",5,"徶徸徹徺徻徾",4,"忇忈忊忋忎忓忔忕忚忛応忞忟忢忣忥忦忨忩忬忯忰忲忳忴忶忷忹忺忼怇"], +["9040","怈怉怋怌怐怑怓怗怘怚怞怟怢怣怤怬怭怮怰",4,"怶",4,"怽怾恀恄",6,"恌恎恏恑恓恔恖恗恘恛恜恞恟恠恡恥恦恮恱恲恴恵恷恾悀"], +["9080","悁悂悅悆悇悈悊悋悎悏悐悑悓悕悗悘悙悜悞悡悢悤悥悧悩悪悮悰悳悵悶悷悹悺悽",7,"惇惈惉惌",4,"惒惓惔惖惗惙惛惞惡",4,"惪惱惲惵惷惸惻",4,"愂愃愄愅愇愊愋愌愐",4,"愖愗愘愙愛愜愝愞愡愢愥愨愩愪愬",18,"慀",6], +["9140","慇慉態慍慏慐慒慓慔慖",6,"慞慟慠慡慣慤慥慦慩",6,"慱慲慳慴慶慸",18,"憌憍憏",4,"憕"], +["9180","憖",6,"憞",8,"憪憫憭",9,"憸",5,"憿懀懁懃",4,"應懌",4,"懓懕",16,"懧",13,"懶",8,"戀",5,"戇戉戓戔戙戜戝戞戠戣戦戧戨戩戫戭戯戰戱戲戵戶戸",4,"扂扄扅扆扊"], +["9240","扏扐払扖扗扙扚扜",6,"扤扥扨扱扲扴扵扷扸扺扻扽抁抂抃抅抆抇抈抋",5,"抔抙抜抝択抣抦抧抩抪抭抮抯抰抲抳抴抶抷抸抺抾拀拁"], +["9280","拃拋拏拑拕拝拞拠拡拤拪拫拰拲拵拸拹拺拻挀挃挄挅挆挊挋挌挍挏挐挒挓挔挕挗挘挙挜挦挧挩挬挭挮挰挱挳",5,"挻挼挾挿捀捁捄捇捈捊捑捒捓捔捖",7,"捠捤捥捦捨捪捫捬捯捰捲捳捴捵捸捹捼捽捾捿掁掃掄掅掆掋掍掑掓掔掕掗掙",6,"採掤掦掫掯掱掲掵掶掹掻掽掿揀"], +["9340","揁揂揃揅揇揈揊揋揌揑揓揔揕揗",6,"揟揢揤",4,"揫揬揮揯揰揱揳揵揷揹揺揻揼揾搃搄搆",4,"損搎搑搒搕",5,"搝搟搢搣搤"], +["9380","搥搧搨搩搫搮",5,"搵",4,"搻搼搾摀摂摃摉摋",6,"摓摕摖摗摙",4,"摟",7,"摨摪摫摬摮",9,"摻",6,"撃撆撈",8,"撓撔撗撘撚撛撜撝撟",4,"撥撦撧撨撪撫撯撱撲撳撴撶撹撻撽撾撿擁擃擄擆",6,"擏擑擓擔擕擖擙據"], +["9440","擛擜擝擟擠擡擣擥擧",24,"攁",7,"攊",7,"攓",4,"攙",8], +["9480","攢攣攤攦",4,"攬攭攰攱攲攳攷攺攼攽敀",4,"敆敇敊敋敍敎敐敒敓敔敗敘敚敜敟敠敡敤敥敧敨敩敪敭敮敯敱敳敵敶數",14,"斈斉斊斍斎斏斒斔斕斖斘斚斝斞斠斢斣斦斨斪斬斮斱",7,"斺斻斾斿旀旂旇旈旉旊旍旐旑旓旔旕旘",7,"旡旣旤旪旫"], +["9540","旲旳旴旵旸旹旻",4,"昁昄昅昇昈昉昋昍昐昑昒昖昗昘昚昛昜昞昡昢昣昤昦昩昪昫昬昮昰昲昳昷",4,"昽昿晀時晄",6,"晍晎晐晑晘"], +["9580","晙晛晜晝晞晠晢晣晥晧晩",4,"晱晲晳晵晸晹晻晼晽晿暀暁暃暅暆暈暉暊暋暍暎暏暐暒暓暔暕暘",4,"暞",8,"暩",4,"暯",4,"暵暶暷暸暺暻暼暽暿",25,"曚曞",7,"曧曨曪",5,"曱曵曶書曺曻曽朁朂會"], +["9640","朄朅朆朇朌朎朏朑朒朓朖朘朙朚朜朞朠",5,"朧朩朮朰朲朳朶朷朸朹朻朼朾朿杁杄杅杇杊杋杍杒杔杕杗",4,"杝杢杣杤杦杧杫杬杮東杴杶"], +["9680","杸杹杺杻杽枀枂枃枅枆枈枊枌枍枎枏枑枒枓枔枖枙枛枟枠枡枤枦枩枬枮枱枲枴枹",7,"柂柅",9,"柕柖柗柛柟柡柣柤柦柧柨柪柫柭柮柲柵",7,"柾栁栂栃栄栆栍栐栒栔栕栘",4,"栞栟栠栢",6,"栫",6,"栴栵栶栺栻栿桇桋桍桏桒桖",5], +["9740","桜桝桞桟桪桬",7,"桵桸",8,"梂梄梇",7,"梐梑梒梔梕梖梘",9,"梣梤梥梩梪梫梬梮梱梲梴梶梷梸"], +["9780","梹",6,"棁棃",5,"棊棌棎棏棐棑棓棔棖棗棙棛",4,"棡棢棤",9,"棯棲棳棴棶棷棸棻棽棾棿椀椂椃椄椆",4,"椌椏椑椓",11,"椡椢椣椥",7,"椮椯椱椲椳椵椶椷椸椺椻椼椾楀楁楃",16,"楕楖楘楙楛楜楟"], +["9840","楡楢楤楥楧楨楩楪楬業楯楰楲",4,"楺楻楽楾楿榁榃榅榊榋榌榎",5,"榖榗榙榚榝",9,"榩榪榬榮榯榰榲榳榵榶榸榹榺榼榽"], +["9880","榾榿槀槂",7,"構槍槏槑槒槓槕",5,"槜槝槞槡",11,"槮槯槰槱槳",9,"槾樀",9,"樋",11,"標",5,"樠樢",5,"権樫樬樭樮樰樲樳樴樶",6,"樿",4,"橅橆橈",7,"橑",6,"橚"], +["9940","橜",4,"橢橣橤橦",10,"橲",6,"橺橻橽橾橿檁檂檃檅",8,"檏檒",4,"檘",7,"檡",5], +["9980","檧檨檪檭",114,"欥欦欨",6], +["9a40","欯欰欱欳欴欵欶欸欻欼欽欿歀歁歂歄歅歈歊歋歍",11,"歚",7,"歨歩歫",13,"歺歽歾歿殀殅殈"], +["9a80","殌殎殏殐殑殔殕殗殘殙殜",4,"殢",7,"殫",7,"殶殸",6,"毀毃毄毆",4,"毌毎毐毑毘毚毜",4,"毢",7,"毬毭毮毰毱毲毴毶毷毸毺毻毼毾",6,"氈",4,"氎氒気氜氝氞氠氣氥氫氬氭氱氳氶氷氹氺氻氼氾氿汃汄汅汈汋",4,"汑汒汓汖汘"], +["9b40","汙汚汢汣汥汦汧汫",4,"汱汳汵汷汸決汻汼汿沀沄沇沊沋沍沎沑沒沕沖沗沘沚沜沝沞沠沢沨沬沯沰沴沵沶沷沺泀況泂泃泆泇泈泋泍泎泏泑泒泘"], +["9b80","泙泚泜泝泟泤泦泧泩泬泭泲泴泹泿洀洂洃洅洆洈洉洊洍洏洐洑洓洔洕洖洘洜洝洟",5,"洦洨洩洬洭洯洰洴洶洷洸洺洿浀浂浄浉浌浐浕浖浗浘浛浝浟浡浢浤浥浧浨浫浬浭浰浱浲浳浵浶浹浺浻浽",4,"涃涄涆涇涊涋涍涏涐涒涖",4,"涜涢涥涬涭涰涱涳涴涶涷涹",5,"淁淂淃淈淉淊"], +["9c40","淍淎淏淐淒淓淔淕淗淚淛淜淟淢淣淥淧淨淩淪淭淯淰淲淴淵淶淸淺淽",7,"渆渇済渉渋渏渒渓渕渘渙減渜渞渟渢渦渧渨渪測渮渰渱渳渵"], +["9c80","渶渷渹渻",7,"湅",7,"湏湐湑湒湕湗湙湚湜湝湞湠",10,"湬湭湯",14,"満溁溂溄溇溈溊",4,"溑",6,"溙溚溛溝溞溠溡溣溤溦溨溩溫溬溭溮溰溳溵溸溹溼溾溿滀滃滄滅滆滈滉滊滌滍滎滐滒滖滘滙滛滜滝滣滧滪",5], +["9d40","滰滱滲滳滵滶滷滸滺",7,"漃漄漅漇漈漊",4,"漐漑漒漖",9,"漡漢漣漥漦漧漨漬漮漰漲漴漵漷",6,"漿潀潁潂"], +["9d80","潃潄潅潈潉潊潌潎",9,"潙潚潛潝潟潠潡潣潤潥潧",5,"潯潰潱潳潵潶潷潹潻潽",6,"澅澆澇澊澋澏",12,"澝澞澟澠澢",4,"澨",10,"澴澵澷澸澺",5,"濁濃",5,"濊",6,"濓",10,"濟濢濣濤濥"], +["9e40","濦",7,"濰",32,"瀒",7,"瀜",6,"瀤",6], +["9e80","瀫",9,"瀶瀷瀸瀺",17,"灍灎灐",13,"灟",11,"灮灱灲灳灴灷灹灺灻災炁炂炃炄炆炇炈炋炌炍炏炐炑炓炗炘炚炛炞",12,"炰炲炴炵炶為炾炿烄烅烆烇烉烋",12,"烚"], +["9f40","烜烝烞烠烡烢烣烥烪烮烰",6,"烸烺烻烼烾",10,"焋",4,"焑焒焔焗焛",10,"焧",7,"焲焳焴"], +["9f80","焵焷",13,"煆煇煈煉煋煍煏",12,"煝煟",4,"煥煩",4,"煯煰煱煴煵煶煷煹煻煼煾",5,"熅",4,"熋熌熍熎熐熑熒熓熕熖熗熚",4,"熡",6,"熩熪熫熭",5,"熴熶熷熸熺",8,"燄",9,"燏",4], +["a040","燖",9,"燡燢燣燤燦燨",5,"燯",9,"燺",11,"爇",19], +["a080","爛爜爞",9,"爩爫爭爮爯爲爳爴爺爼爾牀",6,"牉牊牋牎牏牐牑牓牔牕牗牘牚牜牞牠牣牤牥牨牪牫牬牭牰牱牳牴牶牷牸牻牼牽犂犃犅",4,"犌犎犐犑犓",11,"犠",11,"犮犱犲犳犵犺",6,"狅狆狇狉狊狋狌狏狑狓狔狕狖狘狚狛"], +["a1a1","　、。·ˉˇ¨〃々—～‖…‘’“”〔〕〈",7,"〖〗【】±×÷∶∧∨∑∏∪∩∈∷√⊥∥∠⌒⊙∫∮≡≌≈∽∝≠≮≯≤≥∞∵∴♂♀°′″℃＄¤￠￡‰§№☆★○●◎◇◆□■△▲※→←↑↓〓"], +["a2a1","ⅰ",9], +["a2b1","⒈",19,"⑴",19,"①",9], +["a2e5","㈠",9], +["a2f1","Ⅰ",11], +["a3a1","！＂＃￥％",88,"￣"], +["a4a1","ぁ",82], +["a5a1","ァ",85], +["a6a1","Α",16,"Σ",6], +["a6c1","α",16,"σ",6], +["a6e0","︵︶︹︺︿﹀︽︾﹁﹂﹃﹄"], +["a6ee","︻︼︷︸︱"], +["a6f4","︳︴"], +["a7a1","А",5,"ЁЖ",25], +["a7d1","а",5,"ёж",25], +["a840","ˊˋ˙–―‥‵℅℉↖↗↘↙∕∟∣≒≦≧⊿═",35,"▁",6], +["a880","█",7,"▓▔▕▼▽◢◣◤◥☉⊕〒〝〞"], +["a8a1","āáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜüêɑ"], +["a8bd","ńň"], +["a8c0","ɡ"], +["a8c5","ㄅ",36], +["a940","〡",8,"㊣㎎㎏㎜㎝㎞㎡㏄㏎㏑㏒㏕︰￢￤"], +["a959","℡㈱"], +["a95c","‐"], +["a960","ー゛゜ヽヾ〆ゝゞ﹉",9,"﹔﹕﹖﹗﹙",8], +["a980","﹢",4,"﹨﹩﹪﹫"], +["a996","〇"], +["a9a4","─",75], +["aa40","狜狝狟狢",5,"狪狫狵狶狹狽狾狿猀猂猄",5,"猋猌猍猏猐猑猒猔猘猙猚猟猠猣猤猦猧猨猭猯猰猲猳猵猶猺猻猼猽獀",8], +["aa80","獉獊獋獌獎獏獑獓獔獕獖獘",7,"獡",10,"獮獰獱"], +["ab40","獲",11,"獿",4,"玅玆玈玊玌玍玏玐玒玓玔玕玗玘玙玚玜玝玞玠玡玣",5,"玪玬玭玱玴玵玶玸玹玼玽玾玿珁珃",4], +["ab80","珋珌珎珒",6,"珚珛珜珝珟珡珢珣珤珦珨珪珫珬珮珯珰珱珳",4], +["ac40","珸",10,"琄琇琈琋琌琍琎琑",8,"琜",5,"琣琤琧琩琫琭琯琱琲琷",4,"琽琾琿瑀瑂",11], +["ac80","瑎",6,"瑖瑘瑝瑠",12,"瑮瑯瑱",4,"瑸瑹瑺"], +["ad40","瑻瑼瑽瑿璂璄璅璆璈璉璊璌璍璏璑",10,"璝璟",7,"璪",15,"璻",12], +["ad80","瓈",9,"瓓",8,"瓝瓟瓡瓥瓧",6,"瓰瓱瓲"], +["ae40","瓳瓵瓸",6,"甀甁甂甃甅",7,"甎甐甒甔甕甖甗甛甝甞甠",4,"甦甧甪甮甴甶甹甼甽甿畁畂畃畄畆畇畉畊畍畐畑畒畓畕畖畗畘"], +["ae80","畝",7,"畧畨畩畫",6,"畳畵當畷畺",4,"疀疁疂疄疅疇"], +["af40","疈疉疊疌疍疎疐疓疕疘疛疜疞疢疦",4,"疭疶疷疺疻疿痀痁痆痋痌痎痏痐痑痓痗痙痚痜痝痟痠痡痥痩痬痭痮痯痲痳痵痶痷痸痺痻痽痾瘂瘄瘆瘇"], +["af80","瘈瘉瘋瘍瘎瘏瘑瘒瘓瘔瘖瘚瘜瘝瘞瘡瘣瘧瘨瘬瘮瘯瘱瘲瘶瘷瘹瘺瘻瘽癁療癄"], +["b040","癅",6,"癎",5,"癕癗",4,"癝癟癠癡癢癤",6,"癬癭癮癰",7,"癹発發癿皀皁皃皅皉皊皌皍皏皐皒皔皕皗皘皚皛"], +["b080","皜",7,"皥",8,"皯皰皳皵",9,"盀盁盃啊阿埃挨哎唉哀皑癌蔼矮艾碍爱隘鞍氨安俺按暗岸胺案肮昂盎凹敖熬翱袄傲奥懊澳芭捌扒叭吧笆八疤巴拔跋靶把耙坝霸罢爸白柏百摆佰败拜稗斑班搬扳般颁板版扮拌伴瓣半办绊邦帮梆榜膀绑棒磅蚌镑傍谤苞胞包褒剥"], +["b140","盄盇盉盋盌盓盕盙盚盜盝盞盠",4,"盦",7,"盰盳盵盶盷盺盻盽盿眀眂眃眅眆眊県眎",10,"眛眜眝眞眡眣眤眥眧眪眫"], +["b180","眬眮眰",4,"眹眻眽眾眿睂睄睅睆睈",7,"睒",7,"睜薄雹保堡饱宝抱报暴豹鲍爆杯碑悲卑北辈背贝钡倍狈备惫焙被奔苯本笨崩绷甭泵蹦迸逼鼻比鄙笔彼碧蓖蔽毕毙毖币庇痹闭敝弊必辟壁臂避陛鞭边编贬扁便变卞辨辩辫遍标彪膘表鳖憋别瘪彬斌濒滨宾摈兵冰柄丙秉饼炳"], +["b240","睝睞睟睠睤睧睩睪睭",11,"睺睻睼瞁瞂瞃瞆",5,"瞏瞐瞓",11,"瞡瞣瞤瞦瞨瞫瞭瞮瞯瞱瞲瞴瞶",4], +["b280","瞼瞾矀",12,"矎",8,"矘矙矚矝",4,"矤病并玻菠播拨钵波博勃搏铂箔伯帛舶脖膊渤泊驳捕卜哺补埠不布步簿部怖擦猜裁材才财睬踩采彩菜蔡餐参蚕残惭惨灿苍舱仓沧藏操糙槽曹草厕策侧册测层蹭插叉茬茶查碴搽察岔差诧拆柴豺搀掺蝉馋谗缠铲产阐颤昌猖"], +["b340","矦矨矪矯矰矱矲矴矵矷矹矺矻矼砃",5,"砊砋砎砏砐砓砕砙砛砞砠砡砢砤砨砪砫砮砯砱砲砳砵砶砽砿硁硂硃硄硆硈硉硊硋硍硏硑硓硔硘硙硚"], +["b380","硛硜硞",11,"硯",7,"硸硹硺硻硽",6,"场尝常长偿肠厂敞畅唱倡超抄钞朝嘲潮巢吵炒车扯撤掣彻澈郴臣辰尘晨忱沉陈趁衬撑称城橙成呈乘程惩澄诚承逞骋秤吃痴持匙池迟弛驰耻齿侈尺赤翅斥炽充冲虫崇宠抽酬畴踌稠愁筹仇绸瞅丑臭初出橱厨躇锄雏滁除楚"], +["b440","碄碅碆碈碊碋碏碐碒碔碕碖碙碝碞碠碢碤碦碨",7,"碵碶碷碸確碻碼碽碿磀磂磃磄磆磇磈磌磍磎磏磑磒磓磖磗磘磚",9], +["b480","磤磥磦磧磩磪磫磭",4,"磳磵磶磸磹磻",5,"礂礃礄礆",6,"础储矗搐触处揣川穿椽传船喘串疮窗幢床闯创吹炊捶锤垂春椿醇唇淳纯蠢戳绰疵茨磁雌辞慈瓷词此刺赐次聪葱囱匆从丛凑粗醋簇促蹿篡窜摧崔催脆瘁粹淬翠村存寸磋撮搓措挫错搭达答瘩打大呆歹傣戴带殆代贷袋待逮"], +["b540","礍",5,"礔",9,"礟",4,"礥",14,"礵",4,"礽礿祂祃祄祅祇祊",8,"祔祕祘祙祡祣"], +["b580","祤祦祩祪祫祬祮祰",6,"祹祻",4,"禂禃禆禇禈禉禋禌禍禎禐禑禒怠耽担丹单郸掸胆旦氮但惮淡诞弹蛋当挡党荡档刀捣蹈倒岛祷导到稻悼道盗德得的蹬灯登等瞪凳邓堤低滴迪敌笛狄涤翟嫡抵底地蒂第帝弟递缔颠掂滇碘点典靛垫电佃甸店惦奠淀殿碉叼雕凋刁掉吊钓调跌爹碟蝶迭谍叠"], +["b640","禓",6,"禛",11,"禨",10,"禴",4,"禼禿秂秄秅秇秈秊秌秎秏秐秓秔秖秗秙",5,"秠秡秢秥秨秪"], +["b680","秬秮秱",6,"秹秺秼秾秿稁稄稅稇稈稉稊稌稏",4,"稕稖稘稙稛稜丁盯叮钉顶鼎锭定订丢东冬董懂动栋侗恫冻洞兜抖斗陡豆逗痘都督毒犊独读堵睹赌杜镀肚度渡妒端短锻段断缎堆兑队对墩吨蹲敦顿囤钝盾遁掇哆多夺垛躲朵跺舵剁惰堕蛾峨鹅俄额讹娥恶厄扼遏鄂饿恩而儿耳尔饵洱二"], +["b740","稝稟稡稢稤",14,"稴稵稶稸稺稾穀",5,"穇",9,"穒",4,"穘",16], +["b780","穩",6,"穱穲穳穵穻穼穽穾窂窅窇窉窊窋窌窎窏窐窓窔窙窚窛窞窡窢贰发罚筏伐乏阀法珐藩帆番翻樊矾钒繁凡烦反返范贩犯饭泛坊芳方肪房防妨仿访纺放菲非啡飞肥匪诽吠肺废沸费芬酚吩氛分纷坟焚汾粉奋份忿愤粪丰封枫蜂峰锋风疯烽逢冯缝讽奉凤佛否夫敷肤孵扶拂辐幅氟符伏俘服"], +["b840","窣窤窧窩窪窫窮",4,"窴",10,"竀",10,"竌",9,"竗竘竚竛竜竝竡竢竤竧",5,"竮竰竱竲竳"], +["b880","竴",4,"竻竼竾笀笁笂笅笇笉笌笍笎笐笒笓笖笗笘笚笜笝笟笡笢笣笧笩笭浮涪福袱弗甫抚辅俯釜斧脯腑府腐赴副覆赋复傅付阜父腹负富讣附妇缚咐噶嘎该改概钙盖溉干甘杆柑竿肝赶感秆敢赣冈刚钢缸肛纲岗港杠篙皋高膏羔糕搞镐稿告哥歌搁戈鸽胳疙割革葛格蛤阁隔铬个各给根跟耕更庚羹"], +["b940","笯笰笲笴笵笶笷笹笻笽笿",5,"筆筈筊筍筎筓筕筗筙筜筞筟筡筣",10,"筯筰筳筴筶筸筺筼筽筿箁箂箃箄箆",6,"箎箏"], +["b980","箑箒箓箖箘箙箚箛箞箟箠箣箤箥箮箯箰箲箳箵箶箷箹",7,"篂篃範埂耿梗工攻功恭龚供躬公宫弓巩汞拱贡共钩勾沟苟狗垢构购够辜菇咕箍估沽孤姑鼓古蛊骨谷股故顾固雇刮瓜剐寡挂褂乖拐怪棺关官冠观管馆罐惯灌贯光广逛瑰规圭硅归龟闺轨鬼诡癸桂柜跪贵刽辊滚棍锅郭国果裹过哈"], +["ba40","篅篈築篊篋篍篎篏篐篒篔",4,"篛篜篞篟篠篢篣篤篧篨篩篫篬篭篯篰篲",4,"篸篹篺篻篽篿",7,"簈簉簊簍簎簐",5,"簗簘簙"], +["ba80","簚",4,"簠",5,"簨簩簫",12,"簹",5,"籂骸孩海氦亥害骇酣憨邯韩含涵寒函喊罕翰撼捍旱憾悍焊汗汉夯杭航壕嚎豪毫郝好耗号浩呵喝荷菏核禾和何合盒貉阂河涸赫褐鹤贺嘿黑痕很狠恨哼亨横衡恒轰哄烘虹鸿洪宏弘红喉侯猴吼厚候后呼乎忽瑚壶葫胡蝴狐糊湖"], +["bb40","籃",9,"籎",36,"籵",5,"籾",9], +["bb80","粈粊",6,"粓粔粖粙粚粛粠粡粣粦粧粨粩粫粬粭粯粰粴",4,"粺粻弧虎唬护互沪户花哗华猾滑画划化话槐徊怀淮坏欢环桓还缓换患唤痪豢焕涣宦幻荒慌黄磺蝗簧皇凰惶煌晃幌恍谎灰挥辉徽恢蛔回毁悔慧卉惠晦贿秽会烩汇讳诲绘荤昏婚魂浑混豁活伙火获或惑霍货祸击圾基机畸稽积箕"], +["bc40","粿糀糂糃糄糆糉糋糎",6,"糘糚糛糝糞糡",6,"糩",5,"糰",7,"糹糺糼",13,"紋",5], +["bc80","紑",14,"紡紣紤紥紦紨紩紪紬紭紮細",6,"肌饥迹激讥鸡姬绩缉吉极棘辑籍集及急疾汲即嫉级挤几脊己蓟技冀季伎祭剂悸济寄寂计记既忌际妓继纪嘉枷夹佳家加荚颊贾甲钾假稼价架驾嫁歼监坚尖笺间煎兼肩艰奸缄茧检柬碱硷拣捡简俭剪减荐槛鉴践贱见键箭件"], +["bd40","紷",54,"絯",7], +["bd80","絸",32,"健舰剑饯渐溅涧建僵姜将浆江疆蒋桨奖讲匠酱降蕉椒礁焦胶交郊浇骄娇嚼搅铰矫侥脚狡角饺缴绞剿教酵轿较叫窖揭接皆秸街阶截劫节桔杰捷睫竭洁结解姐戒藉芥界借介疥诫届巾筋斤金今津襟紧锦仅谨进靳晋禁近烬浸"], +["be40","継",12,"綧",6,"綯",42], +["be80","線",32,"尽劲荆兢茎睛晶鲸京惊精粳经井警景颈静境敬镜径痉靖竟竞净炯窘揪究纠玖韭久灸九酒厩救旧臼舅咎就疚鞠拘狙疽居驹菊局咀矩举沮聚拒据巨具距踞锯俱句惧炬剧捐鹃娟倦眷卷绢撅攫抉掘倔爵觉决诀绝均菌钧军君峻"], +["bf40","緻",62], +["bf80","縺縼",4,"繂",4,"繈",21,"俊竣浚郡骏喀咖卡咯开揩楷凯慨刊堪勘坎砍看康慷糠扛抗亢炕考拷烤靠坷苛柯棵磕颗科壳咳可渴克刻客课肯啃垦恳坑吭空恐孔控抠口扣寇枯哭窟苦酷库裤夸垮挎跨胯块筷侩快宽款匡筐狂框矿眶旷况亏盔岿窥葵奎魁傀"], +["c040","繞",35,"纃",23,"纜纝纞"], +["c080","纮纴纻纼绖绤绬绹缊缐缞缷缹缻",6,"罃罆",9,"罒罓馈愧溃坤昆捆困括扩廓阔垃拉喇蜡腊辣啦莱来赖蓝婪栏拦篮阑兰澜谰揽览懒缆烂滥琅榔狼廊郎朗浪捞劳牢老佬姥酪烙涝勒乐雷镭蕾磊累儡垒擂肋类泪棱楞冷厘梨犁黎篱狸离漓理李里鲤礼莉荔吏栗丽厉励砾历利傈例俐"], +["c140","罖罙罛罜罝罞罠罣",4,"罫罬罭罯罰罳罵罶罷罸罺罻罼罽罿羀羂",7,"羋羍羏",4,"羕",4,"羛羜羠羢羣羥羦羨",6,"羱"], +["c180","羳",4,"羺羻羾翀翂翃翄翆翇翈翉翋翍翏",4,"翖翗翙",5,"翢翣痢立粒沥隶力璃哩俩联莲连镰廉怜涟帘敛脸链恋炼练粮凉梁粱良两辆量晾亮谅撩聊僚疗燎寥辽潦了撂镣廖料列裂烈劣猎琳林磷霖临邻鳞淋凛赁吝拎玲菱零龄铃伶羚凌灵陵岭领另令溜琉榴硫馏留刘瘤流柳六龙聋咙笼窿"], +["c240","翤翧翨翪翫翬翭翯翲翴",6,"翽翾翿耂耇耈耉耊耎耏耑耓耚耛耝耞耟耡耣耤耫",5,"耲耴耹耺耼耾聀聁聄聅聇聈聉聎聏聐聑聓聕聖聗"], +["c280","聙聛",13,"聫",5,"聲",11,"隆垄拢陇楼娄搂篓漏陋芦卢颅庐炉掳卤虏鲁麓碌露路赂鹿潞禄录陆戮驴吕铝侣旅履屡缕虑氯律率滤绿峦挛孪滦卵乱掠略抡轮伦仑沦纶论萝螺罗逻锣箩骡裸落洛骆络妈麻玛码蚂马骂嘛吗埋买麦卖迈脉瞒馒蛮满蔓曼慢漫"], +["c340","聾肁肂肅肈肊肍",5,"肔肕肗肙肞肣肦肧肨肬肰肳肵肶肸肹肻胅胇",4,"胏",6,"胘胟胠胢胣胦胮胵胷胹胻胾胿脀脁脃脄脅脇脈脋"], +["c380","脌脕脗脙脛脜脝脟",12,"脭脮脰脳脴脵脷脹",4,"脿谩芒茫盲氓忙莽猫茅锚毛矛铆卯茂冒帽貌贸么玫枚梅酶霉煤没眉媒镁每美昧寐妹媚门闷们萌蒙檬盟锰猛梦孟眯醚靡糜迷谜弥米秘觅泌蜜密幂棉眠绵冕免勉娩缅面苗描瞄藐秒渺庙妙蔑灭民抿皿敏悯闽明螟鸣铭名命谬摸"], +["c440","腀",5,"腇腉腍腎腏腒腖腗腘腛",4,"腡腢腣腤腦腨腪腫腬腯腲腳腵腶腷腸膁膃",4,"膉膋膌膍膎膐膒",5,"膙膚膞",4,"膤膥"], +["c480","膧膩膫",7,"膴",5,"膼膽膾膿臄臅臇臈臉臋臍",6,"摹蘑模膜磨摩魔抹末莫墨默沫漠寞陌谋牟某拇牡亩姆母墓暮幕募慕木目睦牧穆拿哪呐钠那娜纳氖乃奶耐奈南男难囊挠脑恼闹淖呢馁内嫩能妮霓倪泥尼拟你匿腻逆溺蔫拈年碾撵捻念娘酿鸟尿捏聂孽啮镊镍涅您柠狞凝宁"], +["c540","臔",14,"臤臥臦臨臩臫臮",4,"臵",5,"臽臿舃與",4,"舎舏舑舓舕",5,"舝舠舤舥舦舧舩舮舲舺舼舽舿"], +["c580","艀艁艂艃艅艆艈艊艌艍艎艐",7,"艙艛艜艝艞艠",7,"艩拧泞牛扭钮纽脓浓农弄奴努怒女暖虐疟挪懦糯诺哦欧鸥殴藕呕偶沤啪趴爬帕怕琶拍排牌徘湃派攀潘盘磐盼畔判叛乓庞旁耪胖抛咆刨炮袍跑泡呸胚培裴赔陪配佩沛喷盆砰抨烹澎彭蓬棚硼篷膨朋鹏捧碰坯砒霹批披劈琵毗"], +["c640","艪艫艬艭艱艵艶艷艸艻艼芀芁芃芅芆芇芉芌芐芓芔芕芖芚芛芞芠芢芣芧芲芵芶芺芻芼芿苀苂苃苅苆苉苐苖苙苚苝苢苧苨苩苪苬苭苮苰苲苳苵苶苸"], +["c680","苺苼",4,"茊茋茍茐茒茓茖茘茙茝",9,"茩茪茮茰茲茷茻茽啤脾疲皮匹痞僻屁譬篇偏片骗飘漂瓢票撇瞥拼频贫品聘乒坪苹萍平凭瓶评屏坡泼颇婆破魄迫粕剖扑铺仆莆葡菩蒲埔朴圃普浦谱曝瀑期欺栖戚妻七凄漆柒沏其棋奇歧畦崎脐齐旗祈祁骑起岂乞企启契砌器气迄弃汽泣讫掐"], +["c740","茾茿荁荂荄荅荈荊",4,"荓荕",4,"荝荢荰",6,"荹荺荾",6,"莇莈莊莋莌莍莏莐莑莔莕莖莗莙莚莝莟莡",6,"莬莭莮"], +["c780","莯莵莻莾莿菂菃菄菆菈菉菋菍菎菐菑菒菓菕菗菙菚菛菞菢菣菤菦菧菨菫菬菭恰洽牵扦钎铅千迁签仟谦乾黔钱钳前潜遣浅谴堑嵌欠歉枪呛腔羌墙蔷强抢橇锹敲悄桥瞧乔侨巧鞘撬翘峭俏窍切茄且怯窃钦侵亲秦琴勤芹擒禽寝沁青轻氢倾卿清擎晴氰情顷请庆琼穷秋丘邱球求囚酋泅趋区蛆曲躯屈驱渠"], +["c840","菮華菳",4,"菺菻菼菾菿萀萂萅萇萈萉萊萐萒",5,"萙萚萛萞",5,"萩",7,"萲",5,"萹萺萻萾",7,"葇葈葉"], +["c880","葊",6,"葒",4,"葘葝葞葟葠葢葤",4,"葪葮葯葰葲葴葷葹葻葼取娶龋趣去圈颧权醛泉全痊拳犬券劝缺炔瘸却鹊榷确雀裙群然燃冉染瓤壤攘嚷让饶扰绕惹热壬仁人忍韧任认刃妊纫扔仍日戎茸蓉荣融熔溶容绒冗揉柔肉茹蠕儒孺如辱乳汝入褥软阮蕊瑞锐闰润若弱撒洒萨腮鳃塞赛三叁"], +["c940","葽",4,"蒃蒄蒅蒆蒊蒍蒏",7,"蒘蒚蒛蒝蒞蒟蒠蒢",12,"蒰蒱蒳蒵蒶蒷蒻蒼蒾蓀蓂蓃蓅蓆蓇蓈蓋蓌蓎蓏蓒蓔蓕蓗"], +["c980","蓘",4,"蓞蓡蓢蓤蓧",4,"蓭蓮蓯蓱",10,"蓽蓾蔀蔁蔂伞散桑嗓丧搔骚扫嫂瑟色涩森僧莎砂杀刹沙纱傻啥煞筛晒珊苫杉山删煽衫闪陕擅赡膳善汕扇缮墒伤商赏晌上尚裳梢捎稍烧芍勺韶少哨邵绍奢赊蛇舌舍赦摄射慑涉社设砷申呻伸身深娠绅神沈审婶甚肾慎渗声生甥牲升绳"], +["ca40","蔃",8,"蔍蔎蔏蔐蔒蔔蔕蔖蔘蔙蔛蔜蔝蔞蔠蔢",8,"蔭",9,"蔾",4,"蕄蕅蕆蕇蕋",10], +["ca80","蕗蕘蕚蕛蕜蕝蕟",4,"蕥蕦蕧蕩",8,"蕳蕵蕶蕷蕸蕼蕽蕿薀薁省盛剩胜圣师失狮施湿诗尸虱十石拾时什食蚀实识史矢使屎驶始式示士世柿事拭誓逝势是嗜噬适仕侍释饰氏市恃室视试收手首守寿授售受瘦兽蔬枢梳殊抒输叔舒淑疏书赎孰熟薯暑曙署蜀黍鼠属术述树束戍竖墅庶数漱"], +["cb40","薂薃薆薈",6,"薐",10,"薝",6,"薥薦薧薩薫薬薭薱",5,"薸薺",6,"藂",6,"藊",4,"藑藒"], +["cb80","藔藖",5,"藝",6,"藥藦藧藨藪",14,"恕刷耍摔衰甩帅栓拴霜双爽谁水睡税吮瞬顺舜说硕朔烁斯撕嘶思私司丝死肆寺嗣四伺似饲巳松耸怂颂送宋讼诵搜艘擞嗽苏酥俗素速粟僳塑溯宿诉肃酸蒜算虽隋随绥髓碎岁穗遂隧祟孙损笋蓑梭唆缩琐索锁所塌他它她塔"], +["cc40","藹藺藼藽藾蘀",4,"蘆",10,"蘒蘓蘔蘕蘗",15,"蘨蘪",13,"蘹蘺蘻蘽蘾蘿虀"], +["cc80","虁",11,"虒虓處",4,"虛虜虝號虠虡虣",7,"獭挞蹋踏胎苔抬台泰酞太态汰坍摊贪瘫滩坛檀痰潭谭谈坦毯袒碳探叹炭汤塘搪堂棠膛唐糖倘躺淌趟烫掏涛滔绦萄桃逃淘陶讨套特藤腾疼誊梯剔踢锑提题蹄啼体替嚏惕涕剃屉天添填田甜恬舔腆挑条迢眺跳贴铁帖厅听烃"], +["cd40","虭虯虰虲",6,"蚃",6,"蚎",4,"蚔蚖",5,"蚞",4,"蚥蚦蚫蚭蚮蚲蚳蚷蚸蚹蚻",4,"蛁蛂蛃蛅蛈蛌蛍蛒蛓蛕蛖蛗蛚蛜"], +["cd80","蛝蛠蛡蛢蛣蛥蛦蛧蛨蛪蛫蛬蛯蛵蛶蛷蛺蛻蛼蛽蛿蜁蜄蜅蜆蜋蜌蜎蜏蜐蜑蜔蜖汀廷停亭庭挺艇通桐酮瞳同铜彤童桶捅筒统痛偷投头透凸秃突图徒途涂屠土吐兔湍团推颓腿蜕褪退吞屯臀拖托脱鸵陀驮驼椭妥拓唾挖哇蛙洼娃瓦袜歪外豌弯湾玩顽丸烷完碗挽晚皖惋宛婉万腕汪王亡枉网往旺望忘妄威"], +["ce40","蜙蜛蜝蜟蜠蜤蜦蜧蜨蜪蜫蜬蜭蜯蜰蜲蜳蜵蜶蜸蜹蜺蜼蜽蝀",6,"蝊蝋蝍蝏蝐蝑蝒蝔蝕蝖蝘蝚",5,"蝡蝢蝦",7,"蝯蝱蝲蝳蝵"], +["ce80","蝷蝸蝹蝺蝿螀螁螄螆螇螉螊螌螎",4,"螔螕螖螘",6,"螠",4,"巍微危韦违桅围唯惟为潍维苇萎委伟伪尾纬未蔚味畏胃喂魏位渭谓尉慰卫瘟温蚊文闻纹吻稳紊问嗡翁瓮挝蜗涡窝我斡卧握沃巫呜钨乌污诬屋无芜梧吾吴毋武五捂午舞伍侮坞戊雾晤物勿务悟误昔熙析西硒矽晰嘻吸锡牺"], +["cf40","螥螦螧螩螪螮螰螱螲螴螶螷螸螹螻螼螾螿蟁",4,"蟇蟈蟉蟌",4,"蟔",6,"蟜蟝蟞蟟蟡蟢蟣蟤蟦蟧蟨蟩蟫蟬蟭蟯",9], +["cf80","蟺蟻蟼蟽蟿蠀蠁蠂蠄",5,"蠋",7,"蠔蠗蠘蠙蠚蠜",4,"蠣稀息希悉膝夕惜熄烯溪汐犀檄袭席习媳喜铣洗系隙戏细瞎虾匣霞辖暇峡侠狭下厦夏吓掀锨先仙鲜纤咸贤衔舷闲涎弦嫌显险现献县腺馅羡宪陷限线相厢镶香箱襄湘乡翔祥详想响享项巷橡像向象萧硝霄削哮嚣销消宵淆晓"], +["d040","蠤",13,"蠳",5,"蠺蠻蠽蠾蠿衁衂衃衆",5,"衎",5,"衕衖衘衚",6,"衦衧衪衭衯衱衳衴衵衶衸衹衺"], +["d080","衻衼袀袃袆袇袉袊袌袎袏袐袑袓袔袕袗",4,"袝",4,"袣袥",5,"小孝校肖啸笑效楔些歇蝎鞋协挟携邪斜胁谐写械卸蟹懈泄泻谢屑薪芯锌欣辛新忻心信衅星腥猩惺兴刑型形邢行醒幸杏性姓兄凶胸匈汹雄熊休修羞朽嗅锈秀袖绣墟戌需虚嘘须徐许蓄酗叙旭序畜恤絮婿绪续轩喧宣悬旋玄"], +["d140","袬袮袯袰袲",4,"袸袹袺袻袽袾袿裀裃裄裇裈裊裋裌裍裏裐裑裓裖裗裚",4,"裠裡裦裧裩",6,"裲裵裶裷裺裻製裿褀褁褃",5], +["d180","褉褋",4,"褑褔",4,"褜",4,"褢褣褤褦褧褨褩褬褭褮褯褱褲褳褵褷选癣眩绚靴薛学穴雪血勋熏循旬询寻驯巡殉汛训讯逊迅压押鸦鸭呀丫芽牙蚜崖衙涯雅哑亚讶焉咽阉烟淹盐严研蜒岩延言颜阎炎沿奄掩眼衍演艳堰燕厌砚雁唁彦焰宴谚验殃央鸯秧杨扬佯疡羊洋阳氧仰痒养样漾邀腰妖瑶"], +["d240","褸",8,"襂襃襅",24,"襠",5,"襧",19,"襼"], +["d280","襽襾覀覂覄覅覇",26,"摇尧遥窑谣姚咬舀药要耀椰噎耶爷野冶也页掖业叶曳腋夜液一壹医揖铱依伊衣颐夷遗移仪胰疑沂宜姨彝椅蚁倚已乙矣以艺抑易邑屹亿役臆逸肄疫亦裔意毅忆义益溢诣议谊译异翼翌绎茵荫因殷音阴姻吟银淫寅饮尹引隐"], +["d340","覢",30,"觃觍觓觔觕觗觘觙觛觝觟觠觡觢觤觧觨觩觪觬觭觮觰觱觲觴",6], +["d380","觻",4,"訁",5,"計",21,"印英樱婴鹰应缨莹萤营荧蝇迎赢盈影颖硬映哟拥佣臃痈庸雍踊蛹咏泳涌永恿勇用幽优悠忧尤由邮铀犹油游酉有友右佑釉诱又幼迂淤于盂榆虞愚舆余俞逾鱼愉渝渔隅予娱雨与屿禹宇语羽玉域芋郁吁遇喻峪御愈欲狱育誉"], +["d440","訞",31,"訿",8,"詉",21], +["d480","詟",25,"詺",6,"浴寓裕预豫驭鸳渊冤元垣袁原援辕园员圆猿源缘远苑愿怨院曰约越跃钥岳粤月悦阅耘云郧匀陨允运蕴酝晕韵孕匝砸杂栽哉灾宰载再在咱攒暂赞赃脏葬遭糟凿藻枣早澡蚤躁噪造皂灶燥责择则泽贼怎增憎曾赠扎喳渣札轧"], +["d540","誁",7,"誋",7,"誔",46], +["d580","諃",32,"铡闸眨栅榨咋乍炸诈摘斋宅窄债寨瞻毡詹粘沾盏斩辗崭展蘸栈占战站湛绽樟章彰漳张掌涨杖丈帐账仗胀瘴障招昭找沼赵照罩兆肇召遮折哲蛰辙者锗蔗这浙珍斟真甄砧臻贞针侦枕疹诊震振镇阵蒸挣睁征狰争怔整拯正政"], +["d640","諤",34,"謈",27], +["d680","謤謥謧",30,"帧症郑证芝枝支吱蜘知肢脂汁之织职直植殖执值侄址指止趾只旨纸志挚掷至致置帜峙制智秩稚质炙痔滞治窒中盅忠钟衷终种肿重仲众舟周州洲诌粥轴肘帚咒皱宙昼骤珠株蛛朱猪诸诛逐竹烛煮拄瞩嘱主著柱助蛀贮铸筑"], +["d740","譆",31,"譧",4,"譭",25], +["d780","讇",24,"讬讱讻诇诐诪谉谞住注祝驻抓爪拽专砖转撰赚篆桩庄装妆撞壮状椎锥追赘坠缀谆准捉拙卓桌琢茁酌啄着灼浊兹咨资姿滋淄孜紫仔籽滓子自渍字鬃棕踪宗综总纵邹走奏揍租足卒族祖诅阻组钻纂嘴醉最罪尊遵昨左佐柞做作坐座"], +["d840","谸",8,"豂豃豄豅豈豊豋豍",7,"豖豗豘豙豛",5,"豣",6,"豬",6,"豴豵豶豷豻",6,"貃貄貆貇"], +["d880","貈貋貍",6,"貕貖貗貙",20,"亍丌兀丐廿卅丕亘丞鬲孬噩丨禺丿匕乇夭爻卮氐囟胤馗毓睾鼗丶亟鼐乜乩亓芈孛啬嘏仄厍厝厣厥厮靥赝匚叵匦匮匾赜卦卣刂刈刎刭刳刿剀剌剞剡剜蒯剽劂劁劐劓冂罔亻仃仉仂仨仡仫仞伛仳伢佤仵伥伧伉伫佞佧攸佚佝"], +["d940","貮",62], +["d980","賭",32,"佟佗伲伽佶佴侑侉侃侏佾佻侪佼侬侔俦俨俪俅俚俣俜俑俟俸倩偌俳倬倏倮倭俾倜倌倥倨偾偃偕偈偎偬偻傥傧傩傺僖儆僭僬僦僮儇儋仝氽佘佥俎龠汆籴兮巽黉馘冁夔勹匍訇匐凫夙兕亠兖亳衮袤亵脔裒禀嬴蠃羸冫冱冽冼"], +["da40","贎",14,"贠赑赒赗赟赥赨赩赪赬赮赯赱赲赸",8,"趂趃趆趇趈趉趌",4,"趒趓趕",9,"趠趡"], +["da80","趢趤",12,"趲趶趷趹趻趽跀跁跂跅跇跈跉跊跍跐跒跓跔凇冖冢冥讠讦讧讪讴讵讷诂诃诋诏诎诒诓诔诖诘诙诜诟诠诤诨诩诮诰诳诶诹诼诿谀谂谄谇谌谏谑谒谔谕谖谙谛谘谝谟谠谡谥谧谪谫谮谯谲谳谵谶卩卺阝阢阡阱阪阽阼陂陉陔陟陧陬陲陴隈隍隗隰邗邛邝邙邬邡邴邳邶邺"], +["db40","跕跘跙跜跠跡跢跥跦跧跩跭跮跰跱跲跴跶跼跾",6,"踆踇踈踋踍踎踐踑踒踓踕",7,"踠踡踤",4,"踫踭踰踲踳踴踶踷踸踻踼踾"], +["db80","踿蹃蹅蹆蹌",4,"蹓",5,"蹚",11,"蹧蹨蹪蹫蹮蹱邸邰郏郅邾郐郄郇郓郦郢郜郗郛郫郯郾鄄鄢鄞鄣鄱鄯鄹酃酆刍奂劢劬劭劾哿勐勖勰叟燮矍廴凵凼鬯厶弁畚巯坌垩垡塾墼壅壑圩圬圪圳圹圮圯坜圻坂坩垅坫垆坼坻坨坭坶坳垭垤垌垲埏垧垴垓垠埕埘埚埙埒垸埴埯埸埤埝"], +["dc40","蹳蹵蹷",4,"蹽蹾躀躂躃躄躆躈",6,"躑躒躓躕",6,"躝躟",11,"躭躮躰躱躳",6,"躻",7], +["dc80","軃",10,"軏",21,"堋堍埽埭堀堞堙塄堠塥塬墁墉墚墀馨鼙懿艹艽艿芏芊芨芄芎芑芗芙芫芸芾芰苈苊苣芘芷芮苋苌苁芩芴芡芪芟苄苎芤苡茉苷苤茏茇苜苴苒苘茌苻苓茑茚茆茔茕苠苕茜荑荛荜茈莒茼茴茱莛荞茯荏荇荃荟荀茗荠茭茺茳荦荥"], +["dd40","軥",62], +["dd80","輤",32,"荨茛荩荬荪荭荮莰荸莳莴莠莪莓莜莅荼莶莩荽莸荻莘莞莨莺莼菁萁菥菘堇萘萋菝菽菖萜萸萑萆菔菟萏萃菸菹菪菅菀萦菰菡葜葑葚葙葳蒇蒈葺蒉葸萼葆葩葶蒌蒎萱葭蓁蓍蓐蓦蒽蓓蓊蒿蒺蓠蒡蒹蒴蒗蓥蓣蔌甍蔸蓰蔹蔟蔺"], +["de40","轅",32,"轪辀辌辒辝辠辡辢辤辥辦辧辪辬辭辮辯農辳辴辵辷辸辺辻込辿迀迃迆"], +["de80","迉",4,"迏迒迖迗迚迠迡迣迧迬迯迱迲迴迵迶迺迻迼迾迿逇逈逌逎逓逕逘蕖蔻蓿蓼蕙蕈蕨蕤蕞蕺瞢蕃蕲蕻薤薨薇薏蕹薮薜薅薹薷薰藓藁藜藿蘧蘅蘩蘖蘼廾弈夼奁耷奕奚奘匏尢尥尬尴扌扪抟抻拊拚拗拮挢拶挹捋捃掭揶捱捺掎掴捭掬掊捩掮掼揲揸揠揿揄揞揎摒揆掾摅摁搋搛搠搌搦搡摞撄摭撖"], +["df40","這逜連逤逥逧",5,"逰",4,"逷逹逺逽逿遀遃遅遆遈",4,"過達違遖遙遚遜",5,"遤遦遧適遪遫遬遯",4,"遶",6,"遾邁"], +["df80","還邅邆邇邉邊邌",4,"邒邔邖邘邚邜邞邟邠邤邥邧邨邩邫邭邲邷邼邽邿郀摺撷撸撙撺擀擐擗擤擢攉攥攮弋忒甙弑卟叱叽叩叨叻吒吖吆呋呒呓呔呖呃吡呗呙吣吲咂咔呷呱呤咚咛咄呶呦咝哐咭哂咴哒咧咦哓哔呲咣哕咻咿哌哙哚哜咩咪咤哝哏哞唛哧唠哽唔哳唢唣唏唑唧唪啧喏喵啉啭啁啕唿啐唼"], +["e040","郂郃郆郈郉郋郌郍郒郔郕郖郘郙郚郞郟郠郣郤郥郩郪郬郮郰郱郲郳郵郶郷郹郺郻郼郿鄀鄁鄃鄅",19,"鄚鄛鄜"], +["e080","鄝鄟鄠鄡鄤",10,"鄰鄲",6,"鄺",8,"酄唷啖啵啶啷唳唰啜喋嗒喃喱喹喈喁喟啾嗖喑啻嗟喽喾喔喙嗪嗷嗉嘟嗑嗫嗬嗔嗦嗝嗄嗯嗥嗲嗳嗌嗍嗨嗵嗤辔嘞嘈嘌嘁嘤嘣嗾嘀嘧嘭噘嘹噗嘬噍噢噙噜噌噔嚆噤噱噫噻噼嚅嚓嚯囔囗囝囡囵囫囹囿圄圊圉圜帏帙帔帑帱帻帼"], +["e140","酅酇酈酑酓酔酕酖酘酙酛酜酟酠酦酧酨酫酭酳酺酻酼醀",4,"醆醈醊醎醏醓",6,"醜",5,"醤",5,"醫醬醰醱醲醳醶醷醸醹醻"], +["e180","醼",10,"釈釋釐釒",9,"針",8,"帷幄幔幛幞幡岌屺岍岐岖岈岘岙岑岚岜岵岢岽岬岫岱岣峁岷峄峒峤峋峥崂崃崧崦崮崤崞崆崛嵘崾崴崽嵬嵛嵯嵝嵫嵋嵊嵩嵴嶂嶙嶝豳嶷巅彳彷徂徇徉後徕徙徜徨徭徵徼衢彡犭犰犴犷犸狃狁狎狍狒狨狯狩狲狴狷猁狳猃狺"], +["e240","釦",62], +["e280","鈥",32,"狻猗猓猡猊猞猝猕猢猹猥猬猸猱獐獍獗獠獬獯獾舛夥飧夤夂饣饧",5,"饴饷饽馀馄馇馊馍馐馑馓馔馕庀庑庋庖庥庠庹庵庾庳赓廒廑廛廨廪膺忄忉忖忏怃忮怄忡忤忾怅怆忪忭忸怙怵怦怛怏怍怩怫怊怿怡恸恹恻恺恂"], +["e340","鉆",45,"鉵",16], +["e380","銆",7,"銏",24,"恪恽悖悚悭悝悃悒悌悛惬悻悱惝惘惆惚悴愠愦愕愣惴愀愎愫慊慵憬憔憧憷懔懵忝隳闩闫闱闳闵闶闼闾阃阄阆阈阊阋阌阍阏阒阕阖阗阙阚丬爿戕氵汔汜汊沣沅沐沔沌汨汩汴汶沆沩泐泔沭泷泸泱泗沲泠泖泺泫泮沱泓泯泾"], +["e440","銨",5,"銯",24,"鋉",31], +["e480","鋩",32,"洹洧洌浃浈洇洄洙洎洫浍洮洵洚浏浒浔洳涑浯涞涠浞涓涔浜浠浼浣渚淇淅淞渎涿淠渑淦淝淙渖涫渌涮渫湮湎湫溲湟溆湓湔渲渥湄滟溱溘滠漭滢溥溧溽溻溷滗溴滏溏滂溟潢潆潇漤漕滹漯漶潋潴漪漉漩澉澍澌潸潲潼潺濑"], +["e540","錊",51,"錿",10], +["e580","鍊",31,"鍫濉澧澹澶濂濡濮濞濠濯瀚瀣瀛瀹瀵灏灞宀宄宕宓宥宸甯骞搴寤寮褰寰蹇謇辶迓迕迥迮迤迩迦迳迨逅逄逋逦逑逍逖逡逵逶逭逯遄遑遒遐遨遘遢遛暹遴遽邂邈邃邋彐彗彖彘尻咫屐屙孱屣屦羼弪弩弭艴弼鬻屮妁妃妍妩妪妣"], +["e640","鍬",34,"鎐",27], +["e680","鎬",29,"鏋鏌鏍妗姊妫妞妤姒妲妯姗妾娅娆姝娈姣姘姹娌娉娲娴娑娣娓婀婧婊婕娼婢婵胬媪媛婷婺媾嫫媲嫒嫔媸嫠嫣嫱嫖嫦嫘嫜嬉嬗嬖嬲嬷孀尕尜孚孥孳孑孓孢驵驷驸驺驿驽骀骁骅骈骊骐骒骓骖骘骛骜骝骟骠骢骣骥骧纟纡纣纥纨纩"], +["e740","鏎",7,"鏗",54], +["e780","鐎",32,"纭纰纾绀绁绂绉绋绌绐绔绗绛绠绡绨绫绮绯绱绲缍绶绺绻绾缁缂缃缇缈缋缌缏缑缒缗缙缜缛缟缡",6,"缪缫缬缭缯",4,"缵幺畿巛甾邕玎玑玮玢玟珏珂珑玷玳珀珉珈珥珙顼琊珩珧珞玺珲琏琪瑛琦琥琨琰琮琬"], +["e840","鐯",14,"鐿",43,"鑬鑭鑮鑯"], +["e880","鑰",20,"钑钖钘铇铏铓铔铚铦铻锜锠琛琚瑁瑜瑗瑕瑙瑷瑭瑾璜璎璀璁璇璋璞璨璩璐璧瓒璺韪韫韬杌杓杞杈杩枥枇杪杳枘枧杵枨枞枭枋杷杼柰栉柘栊柩枰栌柙枵柚枳柝栀柃枸柢栎柁柽栲栳桠桡桎桢桄桤梃栝桕桦桁桧桀栾桊桉栩梵梏桴桷梓桫棂楮棼椟椠棹"], +["e940","锧锳锽镃镈镋镕镚镠镮镴镵長",7,"門",42], +["e980","閫",32,"椤棰椋椁楗棣椐楱椹楠楂楝榄楫榀榘楸椴槌榇榈槎榉楦楣楹榛榧榻榫榭槔榱槁槊槟榕槠榍槿樯槭樗樘橥槲橄樾檠橐橛樵檎橹樽樨橘橼檑檐檩檗檫猷獒殁殂殇殄殒殓殍殚殛殡殪轫轭轱轲轳轵轶轸轷轹轺轼轾辁辂辄辇辋"], +["ea40","闌",27,"闬闿阇阓阘阛阞阠阣",6,"阫阬阭阯阰阷阸阹阺阾陁陃陊陎陏陑陒陓陖陗"], +["ea80","陘陙陚陜陝陞陠陣陥陦陫陭",4,"陳陸",12,"隇隉隊辍辎辏辘辚軎戋戗戛戟戢戡戥戤戬臧瓯瓴瓿甏甑甓攴旮旯旰昊昙杲昃昕昀炅曷昝昴昱昶昵耆晟晔晁晏晖晡晗晷暄暌暧暝暾曛曜曦曩贲贳贶贻贽赀赅赆赈赉赇赍赕赙觇觊觋觌觎觏觐觑牮犟牝牦牯牾牿犄犋犍犏犒挈挲掰"], +["eb40","隌階隑隒隓隕隖隚際隝",9,"隨",7,"隱隲隴隵隷隸隺隻隿雂雃雈雊雋雐雑雓雔雖",9,"雡",6,"雫"], +["eb80","雬雭雮雰雱雲雴雵雸雺電雼雽雿霂霃霅霊霋霌霐霑霒霔霕霗",4,"霝霟霠搿擘耄毪毳毽毵毹氅氇氆氍氕氘氙氚氡氩氤氪氲攵敕敫牍牒牖爰虢刖肟肜肓肼朊肽肱肫肭肴肷胧胨胩胪胛胂胄胙胍胗朐胝胫胱胴胭脍脎胲胼朕脒豚脶脞脬脘脲腈腌腓腴腙腚腱腠腩腼腽腭腧塍媵膈膂膑滕膣膪臌朦臊膻"], +["ec40","霡",8,"霫霬霮霯霱霳",4,"霺霻霼霽霿",18,"靔靕靗靘靚靜靝靟靣靤靦靧靨靪",7], +["ec80","靲靵靷",4,"靽",7,"鞆",4,"鞌鞎鞏鞐鞓鞕鞖鞗鞙",4,"臁膦欤欷欹歃歆歙飑飒飓飕飙飚殳彀毂觳斐齑斓於旆旄旃旌旎旒旖炀炜炖炝炻烀炷炫炱烨烊焐焓焖焯焱煳煜煨煅煲煊煸煺熘熳熵熨熠燠燔燧燹爝爨灬焘煦熹戾戽扃扈扉礻祀祆祉祛祜祓祚祢祗祠祯祧祺禅禊禚禧禳忑忐"], +["ed40","鞞鞟鞡鞢鞤",6,"鞬鞮鞰鞱鞳鞵",46], +["ed80","韤韥韨韮",4,"韴韷",23,"怼恝恚恧恁恙恣悫愆愍慝憩憝懋懑戆肀聿沓泶淼矶矸砀砉砗砘砑斫砭砜砝砹砺砻砟砼砥砬砣砩硎硭硖硗砦硐硇硌硪碛碓碚碇碜碡碣碲碹碥磔磙磉磬磲礅磴礓礤礞礴龛黹黻黼盱眄眍盹眇眈眚眢眙眭眦眵眸睐睑睇睃睚睨"], +["ee40","頏",62], +["ee80","顎",32,"睢睥睿瞍睽瞀瞌瞑瞟瞠瞰瞵瞽町畀畎畋畈畛畲畹疃罘罡罟詈罨罴罱罹羁罾盍盥蠲钅钆钇钋钊钌钍钏钐钔钗钕钚钛钜钣钤钫钪钭钬钯钰钲钴钶",4,"钼钽钿铄铈",6,"铐铑铒铕铖铗铙铘铛铞铟铠铢铤铥铧铨铪"], +["ef40","顯",5,"颋颎颒颕颙颣風",37,"飏飐飔飖飗飛飜飝飠",4], +["ef80","飥飦飩",30,"铩铫铮铯铳铴铵铷铹铼铽铿锃锂锆锇锉锊锍锎锏锒",4,"锘锛锝锞锟锢锪锫锩锬锱锲锴锶锷锸锼锾锿镂锵镄镅镆镉镌镎镏镒镓镔镖镗镘镙镛镞镟镝镡镢镤",8,"镯镱镲镳锺矧矬雉秕秭秣秫稆嵇稃稂稞稔"], +["f040","餈",4,"餎餏餑",28,"餯",26], +["f080","饊",9,"饖",12,"饤饦饳饸饹饻饾馂馃馉稹稷穑黏馥穰皈皎皓皙皤瓞瓠甬鸠鸢鸨",4,"鸲鸱鸶鸸鸷鸹鸺鸾鹁鹂鹄鹆鹇鹈鹉鹋鹌鹎鹑鹕鹗鹚鹛鹜鹞鹣鹦",6,"鹱鹭鹳疒疔疖疠疝疬疣疳疴疸痄疱疰痃痂痖痍痣痨痦痤痫痧瘃痱痼痿瘐瘀瘅瘌瘗瘊瘥瘘瘕瘙"], +["f140","馌馎馚",10,"馦馧馩",47], +["f180","駙",32,"瘛瘼瘢瘠癀瘭瘰瘿瘵癃瘾瘳癍癞癔癜癖癫癯翊竦穸穹窀窆窈窕窦窠窬窨窭窳衤衩衲衽衿袂袢裆袷袼裉裢裎裣裥裱褚裼裨裾裰褡褙褓褛褊褴褫褶襁襦襻疋胥皲皴矜耒耔耖耜耠耢耥耦耧耩耨耱耋耵聃聆聍聒聩聱覃顸颀颃"], +["f240","駺",62], +["f280","騹",32,"颉颌颍颏颔颚颛颞颟颡颢颥颦虍虔虬虮虿虺虼虻蚨蚍蚋蚬蚝蚧蚣蚪蚓蚩蚶蛄蚵蛎蚰蚺蚱蚯蛉蛏蚴蛩蛱蛲蛭蛳蛐蜓蛞蛴蛟蛘蛑蜃蜇蛸蜈蜊蜍蜉蜣蜻蜞蜥蜮蜚蜾蝈蜴蜱蜩蜷蜿螂蜢蝽蝾蝻蝠蝰蝌蝮螋蝓蝣蝼蝤蝙蝥螓螯螨蟒"], +["f340","驚",17,"驲骃骉骍骎骔骕骙骦骩",6,"骲骳骴骵骹骻骽骾骿髃髄髆",4,"髍髎髏髐髒體髕髖髗髙髚髛髜"], +["f380","髝髞髠髢髣髤髥髧髨髩髪髬髮髰",8,"髺髼",6,"鬄鬅鬆蟆螈螅螭螗螃螫蟥螬螵螳蟋蟓螽蟑蟀蟊蟛蟪蟠蟮蠖蠓蟾蠊蠛蠡蠹蠼缶罂罄罅舐竺竽笈笃笄笕笊笫笏筇笸笪笙笮笱笠笥笤笳笾笞筘筚筅筵筌筝筠筮筻筢筲筱箐箦箧箸箬箝箨箅箪箜箢箫箴篑篁篌篝篚篥篦篪簌篾篼簏簖簋"], +["f440","鬇鬉",5,"鬐鬑鬒鬔",10,"鬠鬡鬢鬤",10,"鬰鬱鬳",7,"鬽鬾鬿魀魆魊魋魌魎魐魒魓魕",5], +["f480","魛",32,"簟簪簦簸籁籀臾舁舂舄臬衄舡舢舣舭舯舨舫舸舻舳舴舾艄艉艋艏艚艟艨衾袅袈裘裟襞羝羟羧羯羰羲籼敉粑粝粜粞粢粲粼粽糁糇糌糍糈糅糗糨艮暨羿翎翕翥翡翦翩翮翳糸絷綦綮繇纛麸麴赳趄趔趑趱赧赭豇豉酊酐酎酏酤"], +["f540","魼",62], +["f580","鮻",32,"酢酡酰酩酯酽酾酲酴酹醌醅醐醍醑醢醣醪醭醮醯醵醴醺豕鹾趸跫踅蹙蹩趵趿趼趺跄跖跗跚跞跎跏跛跆跬跷跸跣跹跻跤踉跽踔踝踟踬踮踣踯踺蹀踹踵踽踱蹉蹁蹂蹑蹒蹊蹰蹶蹼蹯蹴躅躏躔躐躜躞豸貂貊貅貘貔斛觖觞觚觜"], +["f640","鯜",62], +["f680","鰛",32,"觥觫觯訾謦靓雩雳雯霆霁霈霏霎霪霭霰霾龀龃龅",5,"龌黾鼋鼍隹隼隽雎雒瞿雠銎銮鋈錾鍪鏊鎏鐾鑫鱿鲂鲅鲆鲇鲈稣鲋鲎鲐鲑鲒鲔鲕鲚鲛鲞",5,"鲥",4,"鲫鲭鲮鲰",7,"鲺鲻鲼鲽鳄鳅鳆鳇鳊鳋"], +["f740","鰼",62], +["f780","鱻鱽鱾鲀鲃鲄鲉鲊鲌鲏鲓鲖鲗鲘鲙鲝鲪鲬鲯鲹鲾",4,"鳈鳉鳑鳒鳚鳛鳠鳡鳌",4,"鳓鳔鳕鳗鳘鳙鳜鳝鳟鳢靼鞅鞑鞒鞔鞯鞫鞣鞲鞴骱骰骷鹘骶骺骼髁髀髅髂髋髌髑魅魃魇魉魈魍魑飨餍餮饕饔髟髡髦髯髫髻髭髹鬈鬏鬓鬟鬣麽麾縻麂麇麈麋麒鏖麝麟黛黜黝黠黟黢黩黧黥黪黯鼢鼬鼯鼹鼷鼽鼾齄"], +["f840","鳣",62], +["f880","鴢",32], +["f940","鵃",62], +["f980","鶂",32], +["fa40","鶣",62], +["fa80","鷢",32], +["fb40","鸃",27,"鸤鸧鸮鸰鸴鸻鸼鹀鹍鹐鹒鹓鹔鹖鹙鹝鹟鹠鹡鹢鹥鹮鹯鹲鹴",9,"麀"], +["fb80","麁麃麄麅麆麉麊麌",5,"麔",8,"麞麠",5,"麧麨麩麪"], +["fc40","麫",8,"麵麶麷麹麺麼麿",4,"黅黆黇黈黊黋黌黐黒黓黕黖黗黙黚點黡黣黤黦黨黫黬黭黮黰",8,"黺黽黿",6], +["fc80","鼆",4,"鼌鼏鼑鼒鼔鼕鼖鼘鼚",5,"鼡鼣",8,"鼭鼮鼰鼱"], +["fd40","鼲",4,"鼸鼺鼼鼿",4,"齅",10,"齒",38], +["fd80","齹",5,"龁龂龍",11,"龜龝龞龡",4,"郎凉秊裏隣"], +["fe40","兀嗀﨎﨏﨑﨓﨔礼﨟蘒﨡﨣﨤﨧﨨﨩"] +] diff --git a/nodejs/node_modules/iconv-lite/encodings/tables/cp949.json b/nodejs/node_modules/iconv-lite/encodings/tables/cp949.json new file mode 100644 index 000000000..2022a007f --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/tables/cp949.json @@ -0,0 +1,273 @@ +[ +["0","\u0000",127], +["8141","갂갃갅갆갋",4,"갘갞갟갡갢갣갥",6,"갮갲갳갴"], +["8161","갵갶갷갺갻갽갾갿걁",9,"걌걎",5,"걕"], +["8181","걖걗걙걚걛걝",18,"걲걳걵걶걹걻",4,"겂겇겈겍겎겏겑겒겓겕",6,"겞겢",5,"겫겭겮겱",6,"겺겾겿곀곂곃곅곆곇곉곊곋곍",7,"곖곘",7,"곢곣곥곦곩곫곭곮곲곴곷",4,"곾곿괁괂괃괅괇",4,"괎괐괒괓"], +["8241","괔괕괖괗괙괚괛괝괞괟괡",7,"괪괫괮",5], +["8261","괶괷괹괺괻괽",6,"굆굈굊",5,"굑굒굓굕굖굗"], +["8281","굙",7,"굢굤",7,"굮굯굱굲굷굸굹굺굾궀궃",4,"궊궋궍궎궏궑",10,"궞",5,"궥",17,"궸",7,"귂귃귅귆귇귉",6,"귒귔",7,"귝귞귟귡귢귣귥",18], +["8341","귺귻귽귾긂",5,"긊긌긎",5,"긕",7], +["8361","긝",18,"긲긳긵긶긹긻긼"], +["8381","긽긾긿깂깄깇깈깉깋깏깑깒깓깕깗",4,"깞깢깣깤깦깧깪깫깭깮깯깱",6,"깺깾",5,"꺆",5,"꺍",46,"꺿껁껂껃껅",6,"껎껒",5,"껚껛껝",8], +["8441","껦껧껩껪껬껮",5,"껵껶껷껹껺껻껽",8], +["8461","꼆꼉꼊꼋꼌꼎꼏꼑",18], +["8481","꼤",7,"꼮꼯꼱꼳꼵",6,"꼾꽀꽄꽅꽆꽇꽊",5,"꽑",10,"꽞",5,"꽦",18,"꽺",5,"꾁꾂꾃꾅꾆꾇꾉",6,"꾒꾓꾔꾖",5,"꾝",26,"꾺꾻꾽꾾"], +["8541","꾿꿁",5,"꿊꿌꿏",4,"꿕",6,"꿝",4], +["8561","꿢",5,"꿪",5,"꿲꿳꿵꿶꿷꿹",6,"뀂뀃"], +["8581","뀅",6,"뀍뀎뀏뀑뀒뀓뀕",6,"뀞",9,"뀩",26,"끆끇끉끋끍끏끐끑끒끖끘끚끛끜끞",29,"끾끿낁낂낃낅",6,"낎낐낒",5,"낛낝낞낣낤"], +["8641","낥낦낧낪낰낲낶낷낹낺낻낽",6,"냆냊",5,"냒"], +["8661","냓냕냖냗냙",6,"냡냢냣냤냦",10], +["8681","냱",22,"넊넍넎넏넑넔넕넖넗넚넞",4,"넦넧넩넪넫넭",6,"넶넺",5,"녂녃녅녆녇녉",6,"녒녓녖녗녙녚녛녝녞녟녡",22,"녺녻녽녾녿놁놃",4,"놊놌놎놏놐놑놕놖놗놙놚놛놝"], +["8741","놞",9,"놩",15], +["8761","놹",18,"뇍뇎뇏뇑뇒뇓뇕"], +["8781","뇖",5,"뇞뇠",7,"뇪뇫뇭뇮뇯뇱",7,"뇺뇼뇾",5,"눆눇눉눊눍",6,"눖눘눚",5,"눡",18,"눵",6,"눽",26,"뉙뉚뉛뉝뉞뉟뉡",6,"뉪",4], +["8841","뉯",4,"뉶",5,"뉽",6,"늆늇늈늊",4], +["8861","늏늒늓늕늖늗늛",4,"늢늤늧늨늩늫늭늮늯늱늲늳늵늶늷"], +["8881","늸",15,"닊닋닍닎닏닑닓",4,"닚닜닞닟닠닡닣닧닩닪닰닱닲닶닼닽닾댂댃댅댆댇댉",6,"댒댖",5,"댝",54,"덗덙덚덝덠덡덢덣"], +["8941","덦덨덪덬덭덯덲덳덵덶덷덹",6,"뎂뎆",5,"뎍"], +["8961","뎎뎏뎑뎒뎓뎕",10,"뎢",5,"뎩뎪뎫뎭"], +["8981","뎮",21,"돆돇돉돊돍돏돑돒돓돖돘돚돜돞돟돡돢돣돥돦돧돩",18,"돽",18,"됑",6,"됙됚됛됝됞됟됡",6,"됪됬",7,"됵",15], +["8a41","둅",10,"둒둓둕둖둗둙",6,"둢둤둦"], +["8a61","둧",4,"둭",18,"뒁뒂"], +["8a81","뒃",4,"뒉",19,"뒞",5,"뒥뒦뒧뒩뒪뒫뒭",7,"뒶뒸뒺",5,"듁듂듃듅듆듇듉",6,"듑듒듓듔듖",5,"듞듟듡듢듥듧",4,"듮듰듲",5,"듹",26,"딖딗딙딚딝"], +["8b41","딞",5,"딦딫",4,"딲딳딵딶딷딹",6,"땂땆"], +["8b61","땇땈땉땊땎땏땑땒땓땕",6,"땞땢",8], +["8b81","땫",52,"떢떣떥떦떧떩떬떭떮떯떲떶",4,"떾떿뗁뗂뗃뗅",6,"뗎뗒",5,"뗙",18,"뗭",18], +["8c41","똀",15,"똒똓똕똖똗똙",4], +["8c61","똞",6,"똦",5,"똭",6,"똵",5], +["8c81","똻",12,"뙉",26,"뙥뙦뙧뙩",50,"뚞뚟뚡뚢뚣뚥",5,"뚭뚮뚯뚰뚲",16], +["8d41","뛃",16,"뛕",8], +["8d61","뛞",17,"뛱뛲뛳뛵뛶뛷뛹뛺"], +["8d81","뛻",4,"뜂뜃뜄뜆",33,"뜪뜫뜭뜮뜱",6,"뜺뜼",7,"띅띆띇띉띊띋띍",6,"띖",9,"띡띢띣띥띦띧띩",6,"띲띴띶",5,"띾띿랁랂랃랅",6,"랎랓랔랕랚랛랝랞"], +["8e41","랟랡",6,"랪랮",5,"랶랷랹",8], +["8e61","럂",4,"럈럊",19], +["8e81","럞",13,"럮럯럱럲럳럵",6,"럾렂",4,"렊렋렍렎렏렑",6,"렚렜렞",5,"렦렧렩렪렫렭",6,"렶렺",5,"롁롂롃롅",11,"롒롔",7,"롞롟롡롢롣롥",6,"롮롰롲",5,"롹롺롻롽",7], +["8f41","뢅",7,"뢎",17], +["8f61","뢠",7,"뢩",6,"뢱뢲뢳뢵뢶뢷뢹",4], +["8f81","뢾뢿룂룄룆",5,"룍룎룏룑룒룓룕",7,"룞룠룢",5,"룪룫룭룮룯룱",6,"룺룼룾",5,"뤅",18,"뤙",6,"뤡",26,"뤾뤿륁륂륃륅",6,"륍륎륐륒",5], +["9041","륚륛륝륞륟륡",6,"륪륬륮",5,"륶륷륹륺륻륽"], +["9061","륾",5,"릆릈릋릌릏",15], +["9081","릟",12,"릮릯릱릲릳릵",6,"릾맀맂",5,"맊맋맍맓",4,"맚맜맟맠맢맦맧맩맪맫맭",6,"맶맻",4,"먂",5,"먉",11,"먖",33,"먺먻먽먾먿멁멃멄멅멆"], +["9141","멇멊멌멏멐멑멒멖멗멙멚멛멝",6,"멦멪",5], +["9161","멲멳멵멶멷멹",9,"몆몈몉몊몋몍",5], +["9181","몓",20,"몪몭몮몯몱몳",4,"몺몼몾",5,"뫅뫆뫇뫉",14,"뫚",33,"뫽뫾뫿묁묂묃묅",7,"묎묐묒",5,"묙묚묛묝묞묟묡",6], +["9241","묨묪묬",7,"묷묹묺묿",4,"뭆뭈뭊뭋뭌뭎뭑뭒"], +["9261","뭓뭕뭖뭗뭙",7,"뭢뭤",7,"뭭",4], +["9281","뭲",21,"뮉뮊뮋뮍뮎뮏뮑",18,"뮥뮦뮧뮩뮪뮫뮭",6,"뮵뮶뮸",7,"믁믂믃믅믆믇믉",6,"믑믒믔",35,"믺믻믽믾밁"], +["9341","밃",4,"밊밎밐밒밓밙밚밠밡밢밣밦밨밪밫밬밮밯밲밳밵"], +["9361","밶밷밹",6,"뱂뱆뱇뱈뱊뱋뱎뱏뱑",8], +["9381","뱚뱛뱜뱞",37,"벆벇벉벊벍벏",4,"벖벘벛",4,"벢벣벥벦벩",6,"벲벶",5,"벾벿볁볂볃볅",7,"볎볒볓볔볖볗볙볚볛볝",22,"볷볹볺볻볽"], +["9441","볾",5,"봆봈봊",5,"봑봒봓봕",8], +["9461","봞",5,"봥",6,"봭",12], +["9481","봺",5,"뵁",6,"뵊뵋뵍뵎뵏뵑",6,"뵚",9,"뵥뵦뵧뵩",22,"붂붃붅붆붋",4,"붒붔붖붗붘붛붝",6,"붥",10,"붱",6,"붹",24], +["9541","뷒뷓뷖뷗뷙뷚뷛뷝",11,"뷪",5,"뷱"], +["9561","뷲뷳뷵뷶뷷뷹",6,"븁븂븄븆",5,"븎븏븑븒븓"], +["9581","븕",6,"븞븠",35,"빆빇빉빊빋빍빏",4,"빖빘빜빝빞빟빢빣빥빦빧빩빫",4,"빲빶",4,"빾빿뺁뺂뺃뺅",6,"뺎뺒",5,"뺚",13,"뺩",14], +["9641","뺸",23,"뻒뻓"], +["9661","뻕뻖뻙",6,"뻡뻢뻦",5,"뻭",8], +["9681","뻶",10,"뼂",5,"뼊",13,"뼚뼞",33,"뽂뽃뽅뽆뽇뽉",6,"뽒뽓뽔뽖",44], +["9741","뾃",16,"뾕",8], +["9761","뾞",17,"뾱",7], +["9781","뾹",11,"뿆",5,"뿎뿏뿑뿒뿓뿕",6,"뿝뿞뿠뿢",89,"쀽쀾쀿"], +["9841","쁀",16,"쁒",5,"쁙쁚쁛"], +["9861","쁝쁞쁟쁡",6,"쁪",15], +["9881","쁺",21,"삒삓삕삖삗삙",6,"삢삤삦",5,"삮삱삲삷",4,"삾샂샃샄샆샇샊샋샍샎샏샑",6,"샚샞",5,"샦샧샩샪샫샭",6,"샶샸샺",5,"섁섂섃섅섆섇섉",6,"섑섒섓섔섖",5,"섡섢섥섨섩섪섫섮"], +["9941","섲섳섴섵섷섺섻섽섾섿셁",6,"셊셎",5,"셖셗"], +["9961","셙셚셛셝",6,"셦셪",5,"셱셲셳셵셶셷셹셺셻"], +["9981","셼",8,"솆",5,"솏솑솒솓솕솗",4,"솞솠솢솣솤솦솧솪솫솭솮솯솱",11,"솾",5,"쇅쇆쇇쇉쇊쇋쇍",6,"쇕쇖쇙",6,"쇡쇢쇣쇥쇦쇧쇩",6,"쇲쇴",7,"쇾쇿숁숂숃숅",6,"숎숐숒",5,"숚숛숝숞숡숢숣"], +["9a41","숤숥숦숧숪숬숮숰숳숵",16], +["9a61","쉆쉇쉉",6,"쉒쉓쉕쉖쉗쉙",6,"쉡쉢쉣쉤쉦"], +["9a81","쉧",4,"쉮쉯쉱쉲쉳쉵",6,"쉾슀슂",5,"슊",5,"슑",6,"슙슚슜슞",5,"슦슧슩슪슫슮",5,"슶슸슺",33,"싞싟싡싢싥",5,"싮싰싲싳싴싵싷싺싽싾싿쌁",6,"쌊쌋쌎쌏"], +["9b41","쌐쌑쌒쌖쌗쌙쌚쌛쌝",6,"쌦쌧쌪",8], +["9b61","쌳",17,"썆",7], +["9b81","썎",25,"썪썫썭썮썯썱썳",4,"썺썻썾",5,"쎅쎆쎇쎉쎊쎋쎍",50,"쏁",22,"쏚"], +["9c41","쏛쏝쏞쏡쏣",4,"쏪쏫쏬쏮",5,"쏶쏷쏹",5], +["9c61","쏿",8,"쐉",6,"쐑",9], +["9c81","쐛",8,"쐥",6,"쐭쐮쐯쐱쐲쐳쐵",6,"쐾",9,"쑉",26,"쑦쑧쑩쑪쑫쑭",6,"쑶쑷쑸쑺",5,"쒁",18,"쒕",6,"쒝",12], +["9d41","쒪",13,"쒹쒺쒻쒽",8], +["9d61","쓆",25], +["9d81","쓠",8,"쓪",5,"쓲쓳쓵쓶쓷쓹쓻쓼쓽쓾씂",9,"씍씎씏씑씒씓씕",6,"씝",10,"씪씫씭씮씯씱",6,"씺씼씾",5,"앆앇앋앏앐앑앒앖앚앛앜앟앢앣앥앦앧앩",6,"앲앶",5,"앾앿얁얂얃얅얆얈얉얊얋얎얐얒얓얔"], +["9e41","얖얙얚얛얝얞얟얡",7,"얪",9,"얶"], +["9e61","얷얺얿",4,"엋엍엏엒엓엕엖엗엙",6,"엢엤엦엧"], +["9e81","엨엩엪엫엯엱엲엳엵엸엹엺엻옂옃옄옉옊옋옍옎옏옑",6,"옚옝",6,"옦옧옩옪옫옯옱옲옶옸옺옼옽옾옿왂왃왅왆왇왉",6,"왒왖",5,"왞왟왡",10,"왭왮왰왲",5,"왺왻왽왾왿욁",6,"욊욌욎",5,"욖욗욙욚욛욝",6,"욦"], +["9f41","욨욪",5,"욲욳욵욶욷욻",4,"웂웄웆",5,"웎"], +["9f61","웏웑웒웓웕",6,"웞웟웢",5,"웪웫웭웮웯웱웲"], +["9f81","웳",4,"웺웻웼웾",5,"윆윇윉윊윋윍",6,"윖윘윚",5,"윢윣윥윦윧윩",6,"윲윴윶윸윹윺윻윾윿읁읂읃읅",4,"읋읎읐읙읚읛읝읞읟읡",6,"읩읪읬",7,"읶읷읹읺읻읿잀잁잂잆잋잌잍잏잒잓잕잙잛",4,"잢잧",4,"잮잯잱잲잳잵잶잷"], +["a041","잸잹잺잻잾쟂",5,"쟊쟋쟍쟏쟑",6,"쟙쟚쟛쟜"], +["a061","쟞",5,"쟥쟦쟧쟩쟪쟫쟭",13], +["a081","쟻",4,"젂젃젅젆젇젉젋",4,"젒젔젗",4,"젞젟젡젢젣젥",6,"젮젰젲",5,"젹젺젻젽젾젿졁",6,"졊졋졎",5,"졕",26,"졲졳졵졶졷졹졻",4,"좂좄좈좉좊좎",5,"좕",7,"좞좠좢좣좤"], +["a141","좥좦좧좩",18,"좾좿죀죁"], +["a161","죂죃죅죆죇죉죊죋죍",6,"죖죘죚",5,"죢죣죥"], +["a181","죦",14,"죶",5,"죾죿줁줂줃줇",4,"줎　、。·‥…¨〃­―∥＼∼‘’“”〔〕〈",9,"±×÷≠≤≥∞∴°′″℃Å￠￡￥♂♀∠⊥⌒∂∇≡≒§※☆★○●◎◇◆□■△▲▽▼→←↑↓↔〓≪≫√∽∝∵∫∬∈∋⊆⊇⊂⊃∪∩∧∨￢"], +["a241","줐줒",5,"줙",18], +["a261","줭",6,"줵",18], +["a281","쥈",7,"쥒쥓쥕쥖쥗쥙",6,"쥢쥤",7,"쥭쥮쥯⇒⇔∀∃´～ˇ˘˝˚˙¸˛¡¿ː∮∑∏¤℉‰◁◀▷▶♤♠♡♥♧♣⊙◈▣◐◑▒▤▥▨▧▦▩♨☏☎☜☞¶†‡↕↗↙↖↘♭♩♪♬㉿㈜№㏇™㏂㏘℡€®"], +["a341","쥱쥲쥳쥵",6,"쥽",10,"즊즋즍즎즏"], +["a361","즑",6,"즚즜즞",16], +["a381","즯",16,"짂짃짅짆짉짋",4,"짒짔짗짘짛！",58,"￦］",32,"￣"], +["a441","짞짟짡짣짥짦짨짩짪짫짮짲",5,"짺짻짽짾짿쨁쨂쨃쨄"], +["a461","쨅쨆쨇쨊쨎",5,"쨕쨖쨗쨙",12], +["a481","쨦쨧쨨쨪",28,"ㄱ",93], +["a541","쩇",4,"쩎쩏쩑쩒쩓쩕",6,"쩞쩢",5,"쩩쩪"], +["a561","쩫",17,"쩾",5,"쪅쪆"], +["a581","쪇",16,"쪙",14,"ⅰ",9], +["a5b0","Ⅰ",9], +["a5c1","Α",16,"Σ",6], +["a5e1","α",16,"σ",6], +["a641","쪨",19,"쪾쪿쫁쫂쫃쫅"], +["a661","쫆",5,"쫎쫐쫒쫔쫕쫖쫗쫚",5,"쫡",6], +["a681","쫨쫩쫪쫫쫭",6,"쫵",18,"쬉쬊─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂┒┑┚┙┖┕┎┍┞┟┡┢┦┧┩┪┭┮┱┲┵┶┹┺┽┾╀╁╃",7], +["a741","쬋",4,"쬑쬒쬓쬕쬖쬗쬙",6,"쬢",7], +["a761","쬪",22,"쭂쭃쭄"], +["a781","쭅쭆쭇쭊쭋쭍쭎쭏쭑",6,"쭚쭛쭜쭞",5,"쭥",7,"㎕㎖㎗ℓ㎘㏄㎣㎤㎥㎦㎙",9,"㏊㎍㎎㎏㏏㎈㎉㏈㎧㎨㎰",9,"㎀",4,"㎺",5,"㎐",4,"Ω㏀㏁㎊㎋㎌㏖㏅㎭㎮㎯㏛㎩㎪㎫㎬㏝㏐㏓㏃㏉㏜㏆"], +["a841","쭭",10,"쭺",14], +["a861","쮉",18,"쮝",6], +["a881","쮤",19,"쮹",11,"ÆЪĦ"], +["a8a6","IJ"], +["a8a8","ĿŁØŒºÞŦŊ"], +["a8b1","㉠",27,"ⓐ",25,"①",14,"½⅓⅔¼¾⅛⅜⅝⅞"], +["a941","쯅",14,"쯕",10], +["a961","쯠쯡쯢쯣쯥쯦쯨쯪",18], +["a981","쯽",14,"찎찏찑찒찓찕",6,"찞찟찠찣찤æđðħıijĸŀłøœßþŧŋʼn㈀",27,"⒜",25,"⑴",14,"¹²³⁴ⁿ₁₂₃₄"], +["aa41","찥찦찪찫찭찯찱",6,"찺찿",4,"챆챇챉챊챋챍챎"], +["aa61","챏",4,"챖챚",5,"챡챢챣챥챧챩",6,"챱챲"], +["aa81","챳챴챶",29,"ぁ",82], +["ab41","첔첕첖첗첚첛첝첞첟첡",6,"첪첮",5,"첶첷첹"], +["ab61","첺첻첽",6,"쳆쳈쳊",5,"쳑쳒쳓쳕",5], +["ab81","쳛",8,"쳥",6,"쳭쳮쳯쳱",12,"ァ",85], +["ac41","쳾쳿촀촂",5,"촊촋촍촎촏촑",6,"촚촜촞촟촠"], +["ac61","촡촢촣촥촦촧촩촪촫촭",11,"촺",4], +["ac81","촿",28,"쵝쵞쵟А",5,"ЁЖ",25], +["acd1","а",5,"ёж",25], +["ad41","쵡쵢쵣쵥",6,"쵮쵰쵲",5,"쵹",7], +["ad61","춁",6,"춉",10,"춖춗춙춚춛춝춞춟"], +["ad81","춠춡춢춣춦춨춪",5,"춱",18,"췅"], +["ae41","췆",5,"췍췎췏췑",16], +["ae61","췢",5,"췩췪췫췭췮췯췱",6,"췺췼췾",4], +["ae81","츃츅츆츇츉츊츋츍",6,"츕츖츗츘츚",5,"츢츣츥츦츧츩츪츫"], +["af41","츬츭츮츯츲츴츶",19], +["af61","칊",13,"칚칛칝칞칢",5,"칪칬"], +["af81","칮",5,"칶칷칹칺칻칽",6,"캆캈캊",5,"캒캓캕캖캗캙"], +["b041","캚",5,"캢캦",5,"캮",12], +["b061","캻",5,"컂",19], +["b081","컖",13,"컦컧컩컪컭",6,"컶컺",5,"가각간갇갈갉갊감",7,"같",4,"갠갤갬갭갯갰갱갸갹갼걀걋걍걔걘걜거걱건걷걸걺검겁것겄겅겆겉겊겋게겐겔겜겝겟겠겡겨격겪견겯결겸겹겻겼경곁계곈곌곕곗고곡곤곧골곪곬곯곰곱곳공곶과곽관괄괆"], +["b141","켂켃켅켆켇켉",6,"켒켔켖",5,"켝켞켟켡켢켣"], +["b161","켥",6,"켮켲",5,"켹",11], +["b181","콅",14,"콖콗콙콚콛콝",6,"콦콨콪콫콬괌괍괏광괘괜괠괩괬괭괴괵괸괼굄굅굇굉교굔굘굡굣구국군굳굴굵굶굻굼굽굿궁궂궈궉권궐궜궝궤궷귀귁귄귈귐귑귓규균귤그극근귿글긁금급긋긍긔기긱긴긷길긺김깁깃깅깆깊까깍깎깐깔깖깜깝깟깠깡깥깨깩깬깰깸"], +["b241","콭콮콯콲콳콵콶콷콹",6,"쾁쾂쾃쾄쾆",5,"쾍"], +["b261","쾎",18,"쾢",5,"쾩"], +["b281","쾪",5,"쾱",18,"쿅",6,"깹깻깼깽꺄꺅꺌꺼꺽꺾껀껄껌껍껏껐껑께껙껜껨껫껭껴껸껼꼇꼈꼍꼐꼬꼭꼰꼲꼴꼼꼽꼿꽁꽂꽃꽈꽉꽐꽜꽝꽤꽥꽹꾀꾄꾈꾐꾑꾕꾜꾸꾹꾼꿀꿇꿈꿉꿋꿍꿎꿔꿜꿨꿩꿰꿱꿴꿸뀀뀁뀄뀌뀐뀔뀜뀝뀨끄끅끈끊끌끎끓끔끕끗끙"], +["b341","쿌",19,"쿢쿣쿥쿦쿧쿩"], +["b361","쿪",5,"쿲쿴쿶",5,"쿽쿾쿿퀁퀂퀃퀅",5], +["b381","퀋",5,"퀒",5,"퀙",19,"끝끼끽낀낄낌낍낏낑나낙낚난낟날낡낢남납낫",4,"낱낳내낵낸낼냄냅냇냈냉냐냑냔냘냠냥너넉넋넌널넒넓넘넙넛넜넝넣네넥넨넬넴넵넷넸넹녀녁년녈념녑녔녕녘녜녠노녹논놀놂놈놉놋농높놓놔놘놜놨뇌뇐뇔뇜뇝"], +["b441","퀮",5,"퀶퀷퀹퀺퀻퀽",6,"큆큈큊",5], +["b461","큑큒큓큕큖큗큙",6,"큡",10,"큮큯"], +["b481","큱큲큳큵",6,"큾큿킀킂",18,"뇟뇨뇩뇬뇰뇹뇻뇽누눅눈눋눌눔눕눗눙눠눴눼뉘뉜뉠뉨뉩뉴뉵뉼늄늅늉느늑는늘늙늚늠늡늣능늦늪늬늰늴니닉닌닐닒님닙닛닝닢다닥닦단닫",4,"닳담답닷",4,"닿대댁댄댈댐댑댓댔댕댜더덕덖던덛덜덞덟덤덥"], +["b541","킕",14,"킦킧킩킪킫킭",5], +["b561","킳킶킸킺",5,"탂탃탅탆탇탊",5,"탒탖",4], +["b581","탛탞탟탡탢탣탥",6,"탮탲",5,"탹",11,"덧덩덫덮데덱덴델뎀뎁뎃뎄뎅뎌뎐뎔뎠뎡뎨뎬도독돈돋돌돎돐돔돕돗동돛돝돠돤돨돼됐되된될됨됩됫됴두둑둔둘둠둡둣둥둬뒀뒈뒝뒤뒨뒬뒵뒷뒹듀듄듈듐듕드득든듣들듦듬듭듯등듸디딕딘딛딜딤딥딧딨딩딪따딱딴딸"], +["b641","턅",7,"턎",17], +["b661","턠",15,"턲턳턵턶턷턹턻턼턽턾"], +["b681","턿텂텆",5,"텎텏텑텒텓텕",6,"텞텠텢",5,"텩텪텫텭땀땁땃땄땅땋때땍땐땔땜땝땟땠땡떠떡떤떨떪떫떰떱떳떴떵떻떼떽뗀뗄뗌뗍뗏뗐뗑뗘뗬또똑똔똘똥똬똴뙈뙤뙨뚜뚝뚠뚤뚫뚬뚱뛔뛰뛴뛸뜀뜁뜅뜨뜩뜬뜯뜰뜸뜹뜻띄띈띌띔띕띠띤띨띰띱띳띵라락란랄람랍랏랐랑랒랖랗"], +["b741","텮",13,"텽",6,"톅톆톇톉톊"], +["b761","톋",20,"톢톣톥톦톧"], +["b781","톩",6,"톲톴톶톷톸톹톻톽톾톿퇁",14,"래랙랜랠램랩랫랬랭랴략랸럇량러럭런럴럼럽럿렀렁렇레렉렌렐렘렙렛렝려력련렬렴렵렷렸령례롄롑롓로록론롤롬롭롯롱롸롼뢍뢨뢰뢴뢸룀룁룃룅료룐룔룝룟룡루룩룬룰룸룹룻룽뤄뤘뤠뤼뤽륀륄륌륏륑류륙륜률륨륩"], +["b841","퇐",7,"퇙",17], +["b861","퇫",8,"퇵퇶퇷퇹",13], +["b881","툈툊",5,"툑",24,"륫륭르륵른를름릅릇릉릊릍릎리릭린릴림립릿링마막만많",4,"맘맙맛망맞맡맣매맥맨맬맴맵맷맸맹맺먀먁먈먕머먹먼멀멂멈멉멋멍멎멓메멕멘멜멤멥멧멨멩며멱면멸몃몄명몇몌모목몫몬몰몲몸몹못몽뫄뫈뫘뫙뫼"], +["b941","툪툫툮툯툱툲툳툵",6,"툾퉀퉂",5,"퉉퉊퉋퉌"], +["b961","퉍",14,"퉝",6,"퉥퉦퉧퉨"], +["b981","퉩",22,"튂튃튅튆튇튉튊튋튌묀묄묍묏묑묘묜묠묩묫무묵묶문묻물묽묾뭄뭅뭇뭉뭍뭏뭐뭔뭘뭡뭣뭬뮈뮌뮐뮤뮨뮬뮴뮷므믄믈믐믓미믹민믿밀밂밈밉밋밌밍및밑바",4,"받",4,"밤밥밧방밭배백밴밸뱀뱁뱃뱄뱅뱉뱌뱍뱐뱝버벅번벋벌벎범법벗"], +["ba41","튍튎튏튒튓튔튖",5,"튝튞튟튡튢튣튥",6,"튭"], +["ba61","튮튯튰튲",5,"튺튻튽튾틁틃",4,"틊틌",5], +["ba81","틒틓틕틖틗틙틚틛틝",6,"틦",9,"틲틳틵틶틷틹틺벙벚베벡벤벧벨벰벱벳벴벵벼벽변별볍볏볐병볕볘볜보복볶본볼봄봅봇봉봐봔봤봬뵀뵈뵉뵌뵐뵘뵙뵤뵨부북분붇불붉붊붐붑붓붕붙붚붜붤붰붸뷔뷕뷘뷜뷩뷰뷴뷸븀븃븅브븍븐블븜븝븟비빅빈빌빎빔빕빗빙빚빛빠빡빤"], +["bb41","틻",4,"팂팄팆",5,"팏팑팒팓팕팗",4,"팞팢팣"], +["bb61","팤팦팧팪팫팭팮팯팱",6,"팺팾",5,"퍆퍇퍈퍉"], +["bb81","퍊",31,"빨빪빰빱빳빴빵빻빼빽뺀뺄뺌뺍뺏뺐뺑뺘뺙뺨뻐뻑뻔뻗뻘뻠뻣뻤뻥뻬뼁뼈뼉뼘뼙뼛뼜뼝뽀뽁뽄뽈뽐뽑뽕뾔뾰뿅뿌뿍뿐뿔뿜뿟뿡쀼쁑쁘쁜쁠쁨쁩삐삑삔삘삠삡삣삥사삭삯산삳살삵삶삼삽삿샀상샅새색샌샐샘샙샛샜생샤"], +["bc41","퍪",17,"퍾퍿펁펂펃펅펆펇"], +["bc61","펈펉펊펋펎펒",5,"펚펛펝펞펟펡",6,"펪펬펮"], +["bc81","펯",4,"펵펶펷펹펺펻펽",6,"폆폇폊",5,"폑",5,"샥샨샬샴샵샷샹섀섄섈섐섕서",4,"섣설섦섧섬섭섯섰성섶세섹센셀셈셉셋셌셍셔셕션셜셤셥셧셨셩셰셴셸솅소속솎손솔솖솜솝솟송솥솨솩솬솰솽쇄쇈쇌쇔쇗쇘쇠쇤쇨쇰쇱쇳쇼쇽숀숄숌숍숏숑수숙순숟술숨숩숫숭"], +["bd41","폗폙",7,"폢폤",7,"폮폯폱폲폳폵폶폷"], +["bd61","폸폹폺폻폾퐀퐂",5,"퐉",13], +["bd81","퐗",5,"퐞",25,"숯숱숲숴쉈쉐쉑쉔쉘쉠쉥쉬쉭쉰쉴쉼쉽쉿슁슈슉슐슘슛슝스슥슨슬슭슴습슷승시식신싣실싫심십싯싱싶싸싹싻싼쌀쌈쌉쌌쌍쌓쌔쌕쌘쌜쌤쌥쌨쌩썅써썩썬썰썲썸썹썼썽쎄쎈쎌쏀쏘쏙쏜쏟쏠쏢쏨쏩쏭쏴쏵쏸쐈쐐쐤쐬쐰"], +["be41","퐸",7,"푁푂푃푅",14], +["be61","푔",7,"푝푞푟푡푢푣푥",7,"푮푰푱푲"], +["be81","푳",4,"푺푻푽푾풁풃",4,"풊풌풎",5,"풕",8,"쐴쐼쐽쑈쑤쑥쑨쑬쑴쑵쑹쒀쒔쒜쒸쒼쓩쓰쓱쓴쓸쓺쓿씀씁씌씐씔씜씨씩씬씰씸씹씻씽아악안앉않알앍앎앓암압앗았앙앝앞애액앤앨앰앱앳앴앵야약얀얄얇얌얍얏양얕얗얘얜얠얩어억언얹얻얼얽얾엄",6,"엌엎"], +["bf41","풞",10,"풪",14], +["bf61","풹",18,"퓍퓎퓏퓑퓒퓓퓕"], +["bf81","퓖",5,"퓝퓞퓠",7,"퓩퓪퓫퓭퓮퓯퓱",6,"퓹퓺퓼에엑엔엘엠엡엣엥여역엮연열엶엷염",5,"옅옆옇예옌옐옘옙옛옜오옥온올옭옮옰옳옴옵옷옹옻와왁완왈왐왑왓왔왕왜왝왠왬왯왱외왹왼욀욈욉욋욍요욕욘욜욤욥욧용우욱운울욹욺움웁웃웅워웍원월웜웝웠웡웨"], +["c041","퓾",5,"픅픆픇픉픊픋픍",6,"픖픘",5], +["c061","픞",25], +["c081","픸픹픺픻픾픿핁핂핃핅",6,"핎핐핒",5,"핚핛핝핞핟핡핢핣웩웬웰웸웹웽위윅윈윌윔윕윗윙유육윤율윰윱윳융윷으윽은을읊음읍읏응",7,"읜읠읨읫이익인일읽읾잃임입잇있잉잊잎자작잔잖잗잘잚잠잡잣잤장잦재잭잰잴잼잽잿쟀쟁쟈쟉쟌쟎쟐쟘쟝쟤쟨쟬저적전절젊"], +["c141","핤핦핧핪핬핮",5,"핶핷핹핺핻핽",6,"햆햊햋"], +["c161","햌햍햎햏햑",19,"햦햧"], +["c181","햨",31,"점접젓정젖제젝젠젤젬젭젯젱져젼졀졈졉졌졍졔조족존졸졺좀좁좃종좆좇좋좌좍좔좝좟좡좨좼좽죄죈죌죔죕죗죙죠죡죤죵주죽준줄줅줆줌줍줏중줘줬줴쥐쥑쥔쥘쥠쥡쥣쥬쥰쥴쥼즈즉즌즐즘즙즛증지직진짇질짊짐집짓"], +["c241","헊헋헍헎헏헑헓",4,"헚헜헞",5,"헦헧헩헪헫헭헮"], +["c261","헯",4,"헶헸헺",5,"혂혃혅혆혇혉",6,"혒"], +["c281","혖",5,"혝혞혟혡혢혣혥",7,"혮",9,"혺혻징짖짙짚짜짝짠짢짤짧짬짭짯짰짱째짹짼쨀쨈쨉쨋쨌쨍쨔쨘쨩쩌쩍쩐쩔쩜쩝쩟쩠쩡쩨쩽쪄쪘쪼쪽쫀쫄쫌쫍쫏쫑쫓쫘쫙쫠쫬쫴쬈쬐쬔쬘쬠쬡쭁쭈쭉쭌쭐쭘쭙쭝쭤쭸쭹쮜쮸쯔쯤쯧쯩찌찍찐찔찜찝찡찢찧차착찬찮찰참찹찻"], +["c341","혽혾혿홁홂홃홄홆홇홊홌홎홏홐홒홓홖홗홙홚홛홝",4], +["c361","홢",4,"홨홪",5,"홲홳홵",11], +["c381","횁횂횄횆",5,"횎횏횑횒횓횕",7,"횞횠횢",5,"횩횪찼창찾채책챈챌챔챕챗챘챙챠챤챦챨챰챵처척천철첨첩첫첬청체첵첸첼쳄쳅쳇쳉쳐쳔쳤쳬쳰촁초촉촌촐촘촙촛총촤촨촬촹최쵠쵤쵬쵭쵯쵱쵸춈추축춘출춤춥춧충춰췄췌췐취췬췰췸췹췻췽츄츈츌츔츙츠측츤츨츰츱츳층"], +["c441","횫횭횮횯횱",7,"횺횼",7,"훆훇훉훊훋"], +["c461","훍훎훏훐훒훓훕훖훘훚",5,"훡훢훣훥훦훧훩",4], +["c481","훮훯훱훲훳훴훶",5,"훾훿휁휂휃휅",11,"휒휓휔치칙친칟칠칡침칩칫칭카칵칸칼캄캅캇캉캐캑캔캘캠캡캣캤캥캬캭컁커컥컨컫컬컴컵컷컸컹케켁켄켈켐켑켓켕켜켠켤켬켭켯켰켱켸코콕콘콜콤콥콧콩콰콱콴콸쾀쾅쾌쾡쾨쾰쿄쿠쿡쿤쿨쿰쿱쿳쿵쿼퀀퀄퀑퀘퀭퀴퀵퀸퀼"], +["c541","휕휖휗휚휛휝휞휟휡",6,"휪휬휮",5,"휶휷휹"], +["c561","휺휻휽",6,"흅흆흈흊",5,"흒흓흕흚",4], +["c581","흟흢흤흦흧흨흪흫흭흮흯흱흲흳흵",6,"흾흿힀힂",5,"힊힋큄큅큇큉큐큔큘큠크큭큰클큼큽킁키킥킨킬킴킵킷킹타탁탄탈탉탐탑탓탔탕태택탠탤탬탭탯탰탱탸턍터턱턴털턺텀텁텃텄텅테텍텐텔템텝텟텡텨텬텼톄톈토톡톤톨톰톱톳통톺톼퇀퇘퇴퇸툇툉툐투툭툰툴툼툽툿퉁퉈퉜"], +["c641","힍힎힏힑",6,"힚힜힞",5], +["c6a1","퉤튀튁튄튈튐튑튕튜튠튤튬튱트특튼튿틀틂틈틉틋틔틘틜틤틥티틱틴틸팀팁팃팅파팍팎판팔팖팜팝팟팠팡팥패팩팬팰팸팹팻팼팽퍄퍅퍼퍽펀펄펌펍펏펐펑페펙펜펠펨펩펫펭펴편펼폄폅폈평폐폘폡폣포폭폰폴폼폽폿퐁"], +["c7a1","퐈퐝푀푄표푠푤푭푯푸푹푼푿풀풂품풉풋풍풔풩퓌퓐퓔퓜퓟퓨퓬퓰퓸퓻퓽프픈플픔픕픗피픽핀필핌핍핏핑하학한할핥함합핫항해핵핸핼햄햅햇했행햐향허헉헌헐헒험헙헛헝헤헥헨헬헴헵헷헹혀혁현혈혐협혓혔형혜혠"], +["c8a1","혤혭호혹혼홀홅홈홉홋홍홑화확환활홧황홰홱홴횃횅회획횐횔횝횟횡효횬횰횹횻후훅훈훌훑훔훗훙훠훤훨훰훵훼훽휀휄휑휘휙휜휠휨휩휫휭휴휵휸휼흄흇흉흐흑흔흖흗흘흙흠흡흣흥흩희흰흴흼흽힁히힉힌힐힘힙힛힝"], +["caa1","伽佳假價加可呵哥嘉嫁家暇架枷柯歌珂痂稼苛茄街袈訶賈跏軻迦駕刻却各恪慤殼珏脚覺角閣侃刊墾奸姦干幹懇揀杆柬桿澗癎看磵稈竿簡肝艮艱諫間乫喝曷渴碣竭葛褐蝎鞨勘坎堪嵌感憾戡敢柑橄減甘疳監瞰紺邯鑑鑒龕"], +["cba1","匣岬甲胛鉀閘剛堈姜岡崗康强彊慷江畺疆糠絳綱羌腔舡薑襁講鋼降鱇介价個凱塏愷愾慨改槪漑疥皆盖箇芥蓋豈鎧開喀客坑更粳羹醵倨去居巨拒据據擧渠炬祛距踞車遽鉅鋸乾件健巾建愆楗腱虔蹇鍵騫乞傑杰桀儉劍劒檢"], +["cca1","瞼鈐黔劫怯迲偈憩揭擊格檄激膈覡隔堅牽犬甄絹繭肩見譴遣鵑抉決潔結缺訣兼慊箝謙鉗鎌京俓倞傾儆勁勍卿坰境庚徑慶憬擎敬景暻更梗涇炅烱璟璥瓊痙硬磬竟競絅經耕耿脛莖警輕逕鏡頃頸驚鯨係啓堺契季屆悸戒桂械"], +["cda1","棨溪界癸磎稽系繫繼計誡谿階鷄古叩告呱固姑孤尻庫拷攷故敲暠枯槁沽痼皐睾稿羔考股膏苦苽菰藁蠱袴誥賈辜錮雇顧高鼓哭斛曲梏穀谷鵠困坤崑昆梱棍滾琨袞鯤汨滑骨供公共功孔工恐恭拱控攻珙空蚣貢鞏串寡戈果瓜"], +["cea1","科菓誇課跨過鍋顆廓槨藿郭串冠官寬慣棺款灌琯瓘管罐菅觀貫關館刮恝括适侊光匡壙廣曠洸炚狂珖筐胱鑛卦掛罫乖傀塊壞怪愧拐槐魁宏紘肱轟交僑咬喬嬌嶠巧攪敎校橋狡皎矯絞翹膠蕎蛟較轎郊餃驕鮫丘久九仇俱具勾"], +["cfa1","區口句咎嘔坵垢寇嶇廐懼拘救枸柩構歐毆毬求溝灸狗玖球瞿矩究絿耉臼舅舊苟衢謳購軀逑邱鉤銶駒驅鳩鷗龜國局菊鞠鞫麴君窘群裙軍郡堀屈掘窟宮弓穹窮芎躬倦券勸卷圈拳捲權淃眷厥獗蕨蹶闕机櫃潰詭軌饋句晷歸貴"], +["d0a1","鬼龜叫圭奎揆槻珪硅窺竅糾葵規赳逵閨勻均畇筠菌鈞龜橘克剋劇戟棘極隙僅劤勤懃斤根槿瑾筋芹菫覲謹近饉契今妗擒昑檎琴禁禽芩衾衿襟金錦伋及急扱汲級給亘兢矜肯企伎其冀嗜器圻基埼夔奇妓寄岐崎己幾忌技旗旣"], +["d1a1","朞期杞棋棄機欺氣汽沂淇玘琦琪璂璣畸畿碁磯祁祇祈祺箕紀綺羈耆耭肌記譏豈起錡錤飢饑騎騏驥麒緊佶吉拮桔金喫儺喇奈娜懦懶拏拿癩",5,"那樂",4,"諾酪駱亂卵暖欄煖爛蘭難鸞捏捺南嵐枏楠湳濫男藍襤拉"], +["d2a1","納臘蠟衲囊娘廊",4,"乃來內奈柰耐冷女年撚秊念恬拈捻寧寗努勞奴弩怒擄櫓爐瑙盧",5,"駑魯",10,"濃籠聾膿農惱牢磊腦賂雷尿壘",7,"嫩訥杻紐勒",5,"能菱陵尼泥匿溺多茶"], +["d3a1","丹亶但單團壇彖斷旦檀段湍短端簞緞蛋袒鄲鍛撻澾獺疸達啖坍憺擔曇淡湛潭澹痰聃膽蕁覃談譚錟沓畓答踏遝唐堂塘幢戇撞棠當糖螳黨代垈坮大對岱帶待戴擡玳臺袋貸隊黛宅德悳倒刀到圖堵塗導屠島嶋度徒悼挑掉搗桃"], +["d4a1","棹櫂淘渡滔濤燾盜睹禱稻萄覩賭跳蹈逃途道都鍍陶韜毒瀆牘犢獨督禿篤纛讀墩惇敦旽暾沌焞燉豚頓乭突仝冬凍動同憧東桐棟洞潼疼瞳童胴董銅兜斗杜枓痘竇荳讀豆逗頭屯臀芚遁遯鈍得嶝橙燈登等藤謄鄧騰喇懶拏癩羅"], +["d5a1","蘿螺裸邏樂洛烙珞絡落諾酪駱丹亂卵欄欒瀾爛蘭鸞剌辣嵐擥攬欖濫籃纜藍襤覽拉臘蠟廊朗浪狼琅瑯螂郞來崍徠萊冷掠略亮倆兩凉梁樑粮粱糧良諒輛量侶儷勵呂廬慮戾旅櫚濾礪藜蠣閭驢驪麗黎力曆歷瀝礫轢靂憐戀攣漣"], +["d6a1","煉璉練聯蓮輦連鍊冽列劣洌烈裂廉斂殮濂簾獵令伶囹寧岺嶺怜玲笭羚翎聆逞鈴零靈領齡例澧禮醴隷勞怒撈擄櫓潞瀘爐盧老蘆虜路輅露魯鷺鹵碌祿綠菉錄鹿麓論壟弄朧瀧瓏籠聾儡瀨牢磊賂賚賴雷了僚寮廖料燎療瞭聊蓼"], +["d7a1","遼鬧龍壘婁屢樓淚漏瘻累縷蔞褸鏤陋劉旒柳榴流溜瀏琉瑠留瘤硫謬類六戮陸侖倫崙淪綸輪律慄栗率隆勒肋凜凌楞稜綾菱陵俚利厘吏唎履悧李梨浬犁狸理璃異痢籬罹羸莉裏裡里釐離鯉吝潾燐璘藺躪隣鱗麟林淋琳臨霖砬"], +["d8a1","立笠粒摩瑪痲碼磨馬魔麻寞幕漠膜莫邈万卍娩巒彎慢挽晩曼滿漫灣瞞萬蔓蠻輓饅鰻唜抹末沫茉襪靺亡妄忘忙望網罔芒茫莽輞邙埋妹媒寐昧枚梅每煤罵買賣邁魅脈貊陌驀麥孟氓猛盲盟萌冪覓免冕勉棉沔眄眠綿緬面麵滅"], +["d9a1","蔑冥名命明暝椧溟皿瞑茗蓂螟酩銘鳴袂侮冒募姆帽慕摸摹暮某模母毛牟牡瑁眸矛耗芼茅謀謨貌木沐牧目睦穆鶩歿沒夢朦蒙卯墓妙廟描昴杳渺猫竗苗錨務巫憮懋戊拇撫无楙武毋無珷畝繆舞茂蕪誣貿霧鵡墨默們刎吻問文"], +["daa1","汶紊紋聞蚊門雯勿沕物味媚尾嵋彌微未梶楣渼湄眉米美薇謎迷靡黴岷悶愍憫敏旻旼民泯玟珉緡閔密蜜謐剝博拍搏撲朴樸泊珀璞箔粕縛膊舶薄迫雹駁伴半反叛拌搬攀斑槃泮潘班畔瘢盤盼磐磻礬絆般蟠返頒飯勃拔撥渤潑"], +["dba1","發跋醱鉢髮魃倣傍坊妨尨幇彷房放方旁昉枋榜滂磅紡肪膀舫芳蒡蚌訪謗邦防龐倍俳北培徘拜排杯湃焙盃背胚裴裵褙賠輩配陪伯佰帛柏栢白百魄幡樊煩燔番磻繁蕃藩飜伐筏罰閥凡帆梵氾汎泛犯範范法琺僻劈壁擘檗璧癖"], +["dca1","碧蘗闢霹便卞弁變辨辯邊別瞥鱉鼈丙倂兵屛幷昞昺柄棅炳甁病秉竝輧餠騈保堡報寶普步洑湺潽珤甫菩補褓譜輔伏僕匐卜宓復服福腹茯蔔複覆輹輻馥鰒本乶俸奉封峯峰捧棒烽熢琫縫蓬蜂逢鋒鳳不付俯傅剖副否咐埠夫婦"], +["dda1","孚孵富府復扶敷斧浮溥父符簿缶腐腑膚艀芙莩訃負賦賻赴趺部釜阜附駙鳧北分吩噴墳奔奮忿憤扮昐汾焚盆粉糞紛芬賁雰不佛弗彿拂崩朋棚硼繃鵬丕備匕匪卑妃婢庇悲憊扉批斐枇榧比毖毗毘沸泌琵痺砒碑秕秘粃緋翡肥"], +["dea1","脾臂菲蜚裨誹譬費鄙非飛鼻嚬嬪彬斌檳殯浜濱瀕牝玭貧賓頻憑氷聘騁乍事些仕伺似使俟僿史司唆嗣四士奢娑寫寺射巳師徙思捨斜斯柶査梭死沙泗渣瀉獅砂社祀祠私篩紗絲肆舍莎蓑蛇裟詐詞謝賜赦辭邪飼駟麝削數朔索"], +["dfa1","傘刪山散汕珊産疝算蒜酸霰乷撒殺煞薩三參杉森渗芟蔘衫揷澁鈒颯上傷像償商喪嘗孀尙峠常床庠廂想桑橡湘爽牀狀相祥箱翔裳觴詳象賞霜塞璽賽嗇塞穡索色牲生甥省笙墅壻嶼序庶徐恕抒捿敍暑曙書栖棲犀瑞筮絮緖署"], +["e0a1","胥舒薯西誓逝鋤黍鼠夕奭席惜昔晳析汐淅潟石碩蓆釋錫仙僊先善嬋宣扇敾旋渲煽琁瑄璇璿癬禪線繕羨腺膳船蘚蟬詵跣選銑鐥饍鮮卨屑楔泄洩渫舌薛褻設說雪齧剡暹殲纖蟾贍閃陝攝涉燮葉城姓宬性惺成星晟猩珹盛省筬"], +["e1a1","聖聲腥誠醒世勢歲洗稅笹細說貰召嘯塑宵小少巢所掃搔昭梳沼消溯瀟炤燒甦疏疎瘙笑篠簫素紹蔬蕭蘇訴逍遡邵銷韶騷俗屬束涑粟續謖贖速孫巽損蓀遜飡率宋悚松淞訟誦送頌刷殺灑碎鎖衰釗修受嗽囚垂壽嫂守岫峀帥愁"], +["e2a1","戍手授搜收數樹殊水洙漱燧狩獸琇璲瘦睡秀穗竪粹綏綬繡羞脩茱蒐蓚藪袖誰讐輸遂邃酬銖銹隋隧隨雖需須首髓鬚叔塾夙孰宿淑潚熟琡璹肅菽巡徇循恂旬栒楯橓殉洵淳珣盾瞬筍純脣舜荀蓴蕣詢諄醇錞順馴戌術述鉥崇崧"], +["e3a1","嵩瑟膝蝨濕拾習褶襲丞乘僧勝升承昇繩蠅陞侍匙嘶始媤尸屎屍市弑恃施是時枾柴猜矢示翅蒔蓍視試詩諡豕豺埴寔式息拭植殖湜熄篒蝕識軾食飾伸侁信呻娠宸愼新晨燼申神紳腎臣莘薪藎蜃訊身辛辰迅失室實悉審尋心沁"], +["e4a1","沈深瀋甚芯諶什十拾雙氏亞俄兒啞娥峨我牙芽莪蛾衙訝阿雅餓鴉鵝堊岳嶽幄惡愕握樂渥鄂鍔顎鰐齷安岸按晏案眼雁鞍顔鮟斡謁軋閼唵岩巖庵暗癌菴闇壓押狎鴨仰央怏昻殃秧鴦厓哀埃崖愛曖涯碍艾隘靄厄扼掖液縊腋額"], +["e5a1","櫻罌鶯鸚也倻冶夜惹揶椰爺耶若野弱掠略約若葯蒻藥躍亮佯兩凉壤孃恙揚攘敭暘梁楊樣洋瀁煬痒瘍禳穰糧羊良襄諒讓釀陽量養圄御於漁瘀禦語馭魚齬億憶抑檍臆偃堰彦焉言諺孼蘖俺儼嚴奄掩淹嶪業円予余勵呂女如廬"], +["e6a1","旅歟汝濾璵礖礪與艅茹輿轝閭餘驪麗黎亦力域役易曆歷疫繹譯轢逆驛嚥堧姸娟宴年延憐戀捐挻撚椽沇沿涎涓淵演漣烟然煙煉燃燕璉硏硯秊筵緣練縯聯衍軟輦蓮連鉛鍊鳶列劣咽悅涅烈熱裂說閱厭廉念捻染殮炎焰琰艶苒"], +["e7a1","簾閻髥鹽曄獵燁葉令囹塋寧嶺嶸影怜映暎楹榮永泳渶潁濚瀛瀯煐營獰玲瑛瑩瓔盈穎纓羚聆英詠迎鈴鍈零霙靈領乂倪例刈叡曳汭濊猊睿穢芮藝蘂禮裔詣譽豫醴銳隸霓預五伍俉傲午吾吳嗚塢墺奧娛寤悟惡懊敖旿晤梧汚澳"], +["e8a1","烏熬獒筽蜈誤鰲鼇屋沃獄玉鈺溫瑥瘟穩縕蘊兀壅擁瓮甕癰翁邕雍饔渦瓦窩窪臥蛙蝸訛婉完宛梡椀浣玩琓琬碗緩翫脘腕莞豌阮頑曰往旺枉汪王倭娃歪矮外嵬巍猥畏了僚僥凹堯夭妖姚寥寮尿嶢拗搖撓擾料曜樂橈燎燿瑤療"], +["e9a1","窈窯繇繞耀腰蓼蟯要謠遙遼邀饒慾欲浴縟褥辱俑傭冗勇埇墉容庸慂榕涌湧溶熔瑢用甬聳茸蓉踊鎔鏞龍于佑偶優又友右宇寓尤愚憂旴牛玗瑀盂祐禑禹紆羽芋藕虞迂遇郵釪隅雨雩勖彧旭昱栯煜稶郁頊云暈橒殞澐熉耘芸蕓"], +["eaa1","運隕雲韻蔚鬱亐熊雄元原員圓園垣媛嫄寃怨愿援沅洹湲源爰猿瑗苑袁轅遠阮院願鴛月越鉞位偉僞危圍委威尉慰暐渭爲瑋緯胃萎葦蔿蝟衛褘謂違韋魏乳侑儒兪劉唯喩孺宥幼幽庾悠惟愈愉揄攸有杻柔柚柳楡楢油洧流游溜"], +["eba1","濡猶猷琉瑜由留癒硫紐維臾萸裕誘諛諭踰蹂遊逾遺酉釉鍮類六堉戮毓肉育陸倫允奫尹崙淪潤玧胤贇輪鈗閏律慄栗率聿戎瀜絨融隆垠恩慇殷誾銀隱乙吟淫蔭陰音飮揖泣邑凝應膺鷹依倚儀宜意懿擬椅毅疑矣義艤薏蟻衣誼"], +["eca1","議醫二以伊利吏夷姨履已弛彛怡易李梨泥爾珥理異痍痢移罹而耳肄苡荑裏裡貽貳邇里離飴餌匿溺瀷益翊翌翼謚人仁刃印吝咽因姻寅引忍湮燐璘絪茵藺蚓認隣靭靷鱗麟一佚佾壹日溢逸鎰馹任壬妊姙恁林淋稔臨荏賃入卄"], +["eda1","立笠粒仍剩孕芿仔刺咨姉姿子字孜恣慈滋炙煮玆瓷疵磁紫者自茨蔗藉諮資雌作勺嚼斫昨灼炸爵綽芍酌雀鵲孱棧殘潺盞岑暫潛箴簪蠶雜丈仗匠場墻壯奬將帳庄張掌暲杖樟檣欌漿牆狀獐璋章粧腸臟臧莊葬蔣薔藏裝贓醬長"], +["eea1","障再哉在宰才材栽梓渽滓災縡裁財載齋齎爭箏諍錚佇低儲咀姐底抵杵楮樗沮渚狙猪疽箸紵苧菹著藷詛貯躇這邸雎齟勣吊嫡寂摘敵滴狄炙的積笛籍績翟荻謫賊赤跡蹟迪迹適鏑佃佺傳全典前剪塡塼奠專展廛悛戰栓殿氈澱"], +["efa1","煎琠田甸畑癲筌箋箭篆纏詮輾轉鈿銓錢鐫電顚顫餞切截折浙癤竊節絶占岾店漸点粘霑鮎點接摺蝶丁井亭停偵呈姃定幀庭廷征情挺政整旌晶晸柾楨檉正汀淀淨渟湞瀞炡玎珽町睛碇禎程穽精綎艇訂諪貞鄭酊釘鉦鋌錠霆靖"], +["f0a1","靜頂鼎制劑啼堤帝弟悌提梯濟祭第臍薺製諸蹄醍除際霽題齊俎兆凋助嘲弔彫措操早晁曺曹朝條棗槽漕潮照燥爪璪眺祖祚租稠窕粗糟組繰肇藻蚤詔調趙躁造遭釣阻雕鳥族簇足鏃存尊卒拙猝倧宗從悰慫棕淙琮種終綜縱腫"], +["f1a1","踪踵鍾鐘佐坐左座挫罪主住侏做姝胄呪周嗾奏宙州廚晝朱柱株注洲湊澍炷珠疇籌紂紬綢舟蛛註誅走躊輳週酎酒鑄駐竹粥俊儁准埈寯峻晙樽浚準濬焌畯竣蠢逡遵雋駿茁中仲衆重卽櫛楫汁葺增憎曾拯烝甑症繒蒸證贈之只"], +["f2a1","咫地址志持指摯支旨智枝枳止池沚漬知砥祉祗紙肢脂至芝芷蜘誌識贄趾遲直稙稷織職唇嗔塵振搢晉晋桭榛殄津溱珍瑨璡畛疹盡眞瞋秦縉縝臻蔯袗診賑軫辰進鎭陣陳震侄叱姪嫉帙桎瓆疾秩窒膣蛭質跌迭斟朕什執潗緝輯"], +["f3a1","鏶集徵懲澄且侘借叉嗟嵯差次此磋箚茶蹉車遮捉搾着窄錯鑿齪撰澯燦璨瓚竄簒纂粲纘讚贊鑽餐饌刹察擦札紮僭參塹慘慙懺斬站讒讖倉倡創唱娼廠彰愴敞昌昶暢槍滄漲猖瘡窓脹艙菖蒼債埰寀寨彩採砦綵菜蔡采釵冊柵策"], +["f4a1","責凄妻悽處倜刺剔尺慽戚拓擲斥滌瘠脊蹠陟隻仟千喘天川擅泉淺玔穿舛薦賤踐遷釧闡阡韆凸哲喆徹撤澈綴輟轍鐵僉尖沾添甛瞻簽籤詹諂堞妾帖捷牒疊睫諜貼輒廳晴淸聽菁請靑鯖切剃替涕滯締諦逮遞體初剿哨憔抄招梢"], +["f5a1","椒楚樵炒焦硝礁礎秒稍肖艸苕草蕉貂超酢醋醮促囑燭矗蜀觸寸忖村邨叢塚寵悤憁摠總聰蔥銃撮催崔最墜抽推椎楸樞湫皺秋芻萩諏趨追鄒酋醜錐錘鎚雛騶鰍丑畜祝竺筑築縮蓄蹙蹴軸逐春椿瑃出朮黜充忠沖蟲衝衷悴膵萃"], +["f6a1","贅取吹嘴娶就炊翠聚脆臭趣醉驟鷲側仄厠惻測層侈値嗤峙幟恥梔治淄熾痔痴癡稚穉緇緻置致蚩輜雉馳齒則勅飭親七柒漆侵寢枕沈浸琛砧針鍼蟄秤稱快他咤唾墮妥惰打拖朶楕舵陀馱駝倬卓啄坼度托拓擢晫柝濁濯琢琸託"], +["f7a1","鐸呑嘆坦彈憚歎灘炭綻誕奪脫探眈耽貪塔搭榻宕帑湯糖蕩兌台太怠態殆汰泰笞胎苔跆邰颱宅擇澤撑攄兎吐土討慟桶洞痛筒統通堆槌腿褪退頹偸套妬投透鬪慝特闖坡婆巴把播擺杷波派爬琶破罷芭跛頗判坂板版瓣販辦鈑"], +["f8a1","阪八叭捌佩唄悖敗沛浿牌狽稗覇貝彭澎烹膨愎便偏扁片篇編翩遍鞭騙貶坪平枰萍評吠嬖幣廢弊斃肺蔽閉陛佈包匍匏咆哺圃布怖抛抱捕暴泡浦疱砲胞脯苞葡蒲袍褒逋鋪飽鮑幅暴曝瀑爆輻俵剽彪慓杓標漂瓢票表豹飇飄驃"], +["f9a1","品稟楓諷豊風馮彼披疲皮被避陂匹弼必泌珌畢疋筆苾馝乏逼下何厦夏廈昰河瑕荷蝦賀遐霞鰕壑學虐謔鶴寒恨悍旱汗漢澣瀚罕翰閑閒限韓割轄函含咸啣喊檻涵緘艦銜陷鹹合哈盒蛤閤闔陜亢伉姮嫦巷恒抗杭桁沆港缸肛航"], +["faa1","行降項亥偕咳垓奚孩害懈楷海瀣蟹解該諧邂駭骸劾核倖幸杏荇行享向嚮珦鄕響餉饗香噓墟虛許憲櫶獻軒歇險驗奕爀赫革俔峴弦懸晛泫炫玄玹現眩睍絃絢縣舷衒見賢鉉顯孑穴血頁嫌俠協夾峽挾浹狹脅脇莢鋏頰亨兄刑型"], +["fba1","形泂滎瀅灐炯熒珩瑩荊螢衡逈邢鎣馨兮彗惠慧暳蕙蹊醯鞋乎互呼壕壺好岵弧戶扈昊晧毫浩淏湖滸澔濠濩灝狐琥瑚瓠皓祜糊縞胡芦葫蒿虎號蝴護豪鎬頀顥惑或酷婚昏混渾琿魂忽惚笏哄弘汞泓洪烘紅虹訌鴻化和嬅樺火畵"], +["fca1","禍禾花華話譁貨靴廓擴攫確碻穫丸喚奐宦幻患換歡晥桓渙煥環紈還驩鰥活滑猾豁闊凰幌徨恍惶愰慌晃晄榥況湟滉潢煌璜皇篁簧荒蝗遑隍黃匯回廻徊恢悔懷晦會檜淮澮灰獪繪膾茴蛔誨賄劃獲宖橫鐄哮嚆孝效斅曉梟涍淆"], +["fda1","爻肴酵驍侯候厚后吼喉嗅帿後朽煦珝逅勛勳塤壎焄熏燻薰訓暈薨喧暄煊萱卉喙毁彙徽揮暉煇諱輝麾休携烋畦虧恤譎鷸兇凶匈洶胸黑昕欣炘痕吃屹紇訖欠欽歆吸恰洽翕興僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲詰"] +] diff --git a/nodejs/node_modules/iconv-lite/encodings/tables/cp950.json b/nodejs/node_modules/iconv-lite/encodings/tables/cp950.json new file mode 100644 index 000000000..d8bc87178 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/tables/cp950.json @@ -0,0 +1,177 @@ +[ +["0","\u0000",127], +["a140","　，、。．‧；：？！︰…‥﹐﹑﹒·﹔﹕﹖﹗｜–︱—︳╴︴﹏（）︵︶｛｝︷︸〔〕︹︺【】︻︼《》︽︾〈〉︿﹀「」﹁﹂『』﹃﹄﹙﹚"], +["a1a1","﹛﹜﹝﹞‘’“”〝〞‵′＃＆＊※§〃○●△▲◎☆★◇◆□■▽▼㊣℅¯￣＿ˍ﹉﹊﹍﹎﹋﹌﹟﹠﹡＋－×÷±√＜＞＝≦≧≠∞≒≡﹢",4,"～∩∪⊥∠∟⊿㏒㏑∫∮∵∴♀♂⊕⊙↑↓←→↖↗↙↘∥∣／"], +["a240","＼∕﹨＄￥〒￠￡％＠℃℉﹩﹪﹫㏕㎜㎝㎞㏎㎡㎎㎏㏄°兙兛兞兝兡兣嗧瓩糎▁",7,"▏▎▍▌▋▊▉┼┴┬┤├▔─│▕┌┐└┘╭"], +["a2a1","╮╰╯═╞╪╡◢◣◥◤╱╲╳０",9,"Ⅰ",9,"〡",8,"十卄卅Ａ",25,"ａ",21], +["a340","ｗｘｙｚΑ",16,"Σ",6,"α",16,"σ",6,"ㄅ",10], +["a3a1","ㄐ",25,"˙ˉˊˇˋ"], +["a3e1","€"], +["a440","一乙丁七乃九了二人儿入八几刀刁力匕十卜又三下丈上丫丸凡久么也乞于亡兀刃勺千叉口土士夕大女子孑孓寸小尢尸山川工己已巳巾干廾弋弓才"], +["a4a1","丑丐不中丰丹之尹予云井互五亢仁什仃仆仇仍今介仄元允內六兮公冗凶分切刈勻勾勿化匹午升卅卞厄友及反壬天夫太夭孔少尤尺屯巴幻廿弔引心戈戶手扎支文斗斤方日曰月木欠止歹毋比毛氏水火爪父爻片牙牛犬王丙"], +["a540","世丕且丘主乍乏乎以付仔仕他仗代令仙仞充兄冉冊冬凹出凸刊加功包匆北匝仟半卉卡占卯卮去可古右召叮叩叨叼司叵叫另只史叱台句叭叻四囚外"], +["a5a1","央失奴奶孕它尼巨巧左市布平幼弁弘弗必戊打扔扒扑斥旦朮本未末札正母民氐永汁汀氾犯玄玉瓜瓦甘生用甩田由甲申疋白皮皿目矛矢石示禾穴立丞丟乒乓乩亙交亦亥仿伉伙伊伕伍伐休伏仲件任仰仳份企伋光兇兆先全"], +["a640","共再冰列刑划刎刖劣匈匡匠印危吉吏同吊吐吁吋各向名合吃后吆吒因回囝圳地在圭圬圯圩夙多夷夸妄奸妃好她如妁字存宇守宅安寺尖屹州帆并年"], +["a6a1","式弛忙忖戎戌戍成扣扛托收早旨旬旭曲曳有朽朴朱朵次此死氖汝汗汙江池汐汕污汛汍汎灰牟牝百竹米糸缶羊羽老考而耒耳聿肉肋肌臣自至臼舌舛舟艮色艾虫血行衣西阡串亨位住佇佗佞伴佛何估佐佑伽伺伸佃佔似但佣"], +["a740","作你伯低伶余佝佈佚兌克免兵冶冷別判利刪刨劫助努劬匣即卵吝吭吞吾否呎吧呆呃吳呈呂君吩告吹吻吸吮吵吶吠吼呀吱含吟听囪困囤囫坊坑址坍"], +["a7a1","均坎圾坐坏圻壯夾妝妒妨妞妣妙妖妍妤妓妊妥孝孜孚孛完宋宏尬局屁尿尾岐岑岔岌巫希序庇床廷弄弟彤形彷役忘忌志忍忱快忸忪戒我抄抗抖技扶抉扭把扼找批扳抒扯折扮投抓抑抆改攻攸旱更束李杏材村杜杖杞杉杆杠"], +["a840","杓杗步每求汞沙沁沈沉沅沛汪決沐汰沌汨沖沒汽沃汲汾汴沆汶沍沔沘沂灶灼災灸牢牡牠狄狂玖甬甫男甸皂盯矣私秀禿究系罕肖肓肝肘肛肚育良芒"], +["a8a1","芋芍見角言谷豆豕貝赤走足身車辛辰迂迆迅迄巡邑邢邪邦那酉釆里防阮阱阪阬並乖乳事些亞享京佯依侍佳使佬供例來侃佰併侈佩佻侖佾侏侑佺兔兒兕兩具其典冽函刻券刷刺到刮制剁劾劻卒協卓卑卦卷卸卹取叔受味呵"], +["a940","咖呸咕咀呻呷咄咒咆呼咐呱呶和咚呢周咋命咎固垃坷坪坩坡坦坤坼夜奉奇奈奄奔妾妻委妹妮姑姆姐姍始姓姊妯妳姒姅孟孤季宗定官宜宙宛尚屈居"], +["a9a1","屆岷岡岸岩岫岱岳帘帚帖帕帛帑幸庚店府底庖延弦弧弩往征彿彼忝忠忽念忿怏怔怯怵怖怪怕怡性怩怫怛或戕房戾所承拉拌拄抿拂抹拒招披拓拔拋拈抨抽押拐拙拇拍抵拚抱拘拖拗拆抬拎放斧於旺昔易昌昆昂明昀昏昕昊"], +["aa40","昇服朋杭枋枕東果杳杷枇枝林杯杰板枉松析杵枚枓杼杪杲欣武歧歿氓氛泣注泳沱泌泥河沽沾沼波沫法泓沸泄油況沮泗泅泱沿治泡泛泊沬泯泜泖泠"], +["aaa1","炕炎炒炊炙爬爭爸版牧物狀狎狙狗狐玩玨玟玫玥甽疝疙疚的盂盲直知矽社祀祁秉秈空穹竺糾罔羌羋者肺肥肢肱股肫肩肴肪肯臥臾舍芳芝芙芭芽芟芹花芬芥芯芸芣芰芾芷虎虱初表軋迎返近邵邸邱邶采金長門阜陀阿阻附"], +["ab40","陂隹雨青非亟亭亮信侵侯便俠俑俏保促侶俘俟俊俗侮俐俄係俚俎俞侷兗冒冑冠剎剃削前剌剋則勇勉勃勁匍南卻厚叛咬哀咨哎哉咸咦咳哇哂咽咪品"], +["aba1","哄哈咯咫咱咻咩咧咿囿垂型垠垣垢城垮垓奕契奏奎奐姜姘姿姣姨娃姥姪姚姦威姻孩宣宦室客宥封屎屏屍屋峙峒巷帝帥帟幽庠度建弈弭彥很待徊律徇後徉怒思怠急怎怨恍恰恨恢恆恃恬恫恪恤扁拜挖按拼拭持拮拽指拱拷"], +["ac40","拯括拾拴挑挂政故斫施既春昭映昧是星昨昱昤曷柿染柱柔某柬架枯柵柩柯柄柑枴柚查枸柏柞柳枰柙柢柝柒歪殃殆段毒毗氟泉洋洲洪流津洌洱洞洗"], +["aca1","活洽派洶洛泵洹洧洸洩洮洵洎洫炫為炳炬炯炭炸炮炤爰牲牯牴狩狠狡玷珊玻玲珍珀玳甚甭畏界畎畋疫疤疥疢疣癸皆皇皈盈盆盃盅省盹相眉看盾盼眇矜砂研砌砍祆祉祈祇禹禺科秒秋穿突竿竽籽紂紅紀紉紇約紆缸美羿耄"], +["ad40","耐耍耑耶胖胥胚胃胄背胡胛胎胞胤胝致舢苧范茅苣苛苦茄若茂茉苒苗英茁苜苔苑苞苓苟苯茆虐虹虻虺衍衫要觔計訂訃貞負赴赳趴軍軌述迦迢迪迥"], +["ada1","迭迫迤迨郊郎郁郃酋酊重閂限陋陌降面革韋韭音頁風飛食首香乘亳倌倍倣俯倦倥俸倩倖倆值借倚倒們俺倀倔倨俱倡個候倘俳修倭倪俾倫倉兼冤冥冢凍凌准凋剖剜剔剛剝匪卿原厝叟哨唐唁唷哼哥哲唆哺唔哩哭員唉哮哪"], +["ae40","哦唧唇哽唏圃圄埂埔埋埃堉夏套奘奚娑娘娜娟娛娓姬娠娣娩娥娌娉孫屘宰害家宴宮宵容宸射屑展屐峭峽峻峪峨峰島崁峴差席師庫庭座弱徒徑徐恙"], +["aea1","恣恥恐恕恭恩息悄悟悚悍悔悌悅悖扇拳挈拿捎挾振捕捂捆捏捉挺捐挽挪挫挨捍捌效敉料旁旅時晉晏晃晒晌晅晁書朔朕朗校核案框桓根桂桔栩梳栗桌桑栽柴桐桀格桃株桅栓栘桁殊殉殷氣氧氨氦氤泰浪涕消涇浦浸海浙涓"], +["af40","浬涉浮浚浴浩涌涊浹涅浥涔烊烘烤烙烈烏爹特狼狹狽狸狷玆班琉珮珠珪珞畔畝畜畚留疾病症疲疳疽疼疹痂疸皋皰益盍盎眩真眠眨矩砰砧砸砝破砷"], +["afa1","砥砭砠砟砲祕祐祠祟祖神祝祗祚秤秣秧租秦秩秘窄窈站笆笑粉紡紗紋紊素索純紐紕級紜納紙紛缺罟羔翅翁耆耘耕耙耗耽耿胱脂胰脅胭胴脆胸胳脈能脊胼胯臭臬舀舐航舫舨般芻茫荒荔荊茸荐草茵茴荏茲茹茶茗荀茱茨荃"], +["b040","虔蚊蚪蚓蚤蚩蚌蚣蚜衰衷袁袂衽衹記訐討訌訕訊託訓訖訏訑豈豺豹財貢起躬軒軔軏辱送逆迷退迺迴逃追逅迸邕郡郝郢酒配酌釘針釗釜釙閃院陣陡"], +["b0a1","陛陝除陘陞隻飢馬骨高鬥鬲鬼乾偺偽停假偃偌做偉健偶偎偕偵側偷偏倏偯偭兜冕凰剪副勒務勘動匐匏匙匿區匾參曼商啪啦啄啞啡啃啊唱啖問啕唯啤唸售啜唬啣唳啁啗圈國圉域堅堊堆埠埤基堂堵執培夠奢娶婁婉婦婪婀"], +["b140","娼婢婚婆婊孰寇寅寄寂宿密尉專將屠屜屝崇崆崎崛崖崢崑崩崔崙崤崧崗巢常帶帳帷康庸庶庵庾張強彗彬彩彫得徙從徘御徠徜恿患悉悠您惋悴惦悽"], +["b1a1","情悻悵惜悼惘惕惆惟悸惚惇戚戛扈掠控捲掖探接捷捧掘措捱掩掉掃掛捫推掄授掙採掬排掏掀捻捩捨捺敝敖救教敗啟敏敘敕敔斜斛斬族旋旌旎晝晚晤晨晦晞曹勗望梁梯梢梓梵桿桶梱梧梗械梃棄梭梆梅梔條梨梟梡梂欲殺"], +["b240","毫毬氫涎涼淳淙液淡淌淤添淺清淇淋涯淑涮淞淹涸混淵淅淒渚涵淚淫淘淪深淮淨淆淄涪淬涿淦烹焉焊烽烯爽牽犁猜猛猖猓猙率琅琊球理現琍瓠瓶"], +["b2a1","瓷甜產略畦畢異疏痔痕疵痊痍皎盔盒盛眷眾眼眶眸眺硫硃硎祥票祭移窒窕笠笨笛第符笙笞笮粒粗粕絆絃統紮紹紼絀細紳組累終紲紱缽羞羚翌翎習耜聊聆脯脖脣脫脩脰脤舂舵舷舶船莎莞莘荸莢莖莽莫莒莊莓莉莠荷荻荼"], +["b340","莆莧處彪蛇蛀蚶蛄蚵蛆蛋蚱蚯蛉術袞袈被袒袖袍袋覓規訪訝訣訥許設訟訛訢豉豚販責貫貨貪貧赧赦趾趺軛軟這逍通逗連速逝逐逕逞造透逢逖逛途"], +["b3a1","部郭都酗野釵釦釣釧釭釩閉陪陵陳陸陰陴陶陷陬雀雪雩章竟頂頃魚鳥鹵鹿麥麻傢傍傅備傑傀傖傘傚最凱割剴創剩勞勝勛博厥啻喀喧啼喊喝喘喂喜喪喔喇喋喃喳單喟唾喲喚喻喬喱啾喉喫喙圍堯堪場堤堰報堡堝堠壹壺奠"], +["b440","婷媚婿媒媛媧孳孱寒富寓寐尊尋就嵌嵐崴嵇巽幅帽幀幃幾廊廁廂廄弼彭復循徨惑惡悲悶惠愜愣惺愕惰惻惴慨惱愎惶愉愀愒戟扉掣掌描揀揩揉揆揍"], +["b4a1","插揣提握揖揭揮捶援揪換摒揚揹敞敦敢散斑斐斯普晰晴晶景暑智晾晷曾替期朝棺棕棠棘棗椅棟棵森棧棹棒棲棣棋棍植椒椎棉棚楮棻款欺欽殘殖殼毯氮氯氬港游湔渡渲湧湊渠渥渣減湛湘渤湖湮渭渦湯渴湍渺測湃渝渾滋"], +["b540","溉渙湎湣湄湲湩湟焙焚焦焰無然煮焜牌犄犀猶猥猴猩琺琪琳琢琥琵琶琴琯琛琦琨甥甦畫番痢痛痣痙痘痞痠登發皖皓皴盜睏短硝硬硯稍稈程稅稀窘"], +["b5a1","窗窖童竣等策筆筐筒答筍筋筏筑粟粥絞結絨絕紫絮絲絡給絢絰絳善翔翕耋聒肅腕腔腋腑腎脹腆脾腌腓腴舒舜菩萃菸萍菠菅萋菁華菱菴著萊菰萌菌菽菲菊萸萎萄菜萇菔菟虛蛟蛙蛭蛔蛛蛤蛐蛞街裁裂袱覃視註詠評詞証詁"], +["b640","詔詛詐詆訴診訶詖象貂貯貼貳貽賁費賀貴買貶貿貸越超趁跎距跋跚跑跌跛跆軻軸軼辜逮逵週逸進逶鄂郵鄉郾酣酥量鈔鈕鈣鈉鈞鈍鈐鈇鈑閔閏開閑"], +["b6a1","間閒閎隊階隋陽隅隆隍陲隄雁雅雄集雇雯雲韌項順須飧飪飯飩飲飭馮馭黃黍黑亂傭債傲傳僅傾催傷傻傯僇剿剷剽募勦勤勢勣匯嗟嗨嗓嗦嗎嗜嗇嗑嗣嗤嗯嗚嗡嗅嗆嗥嗉園圓塞塑塘塗塚塔填塌塭塊塢塒塋奧嫁嫉嫌媾媽媼"], +["b740","媳嫂媲嵩嵯幌幹廉廈弒彙徬微愚意慈感想愛惹愁愈慎慌慄慍愾愴愧愍愆愷戡戢搓搾搞搪搭搽搬搏搜搔損搶搖搗搆敬斟新暗暉暇暈暖暄暘暍會榔業"], +["b7a1","楚楷楠楔極椰概楊楨楫楞楓楹榆楝楣楛歇歲毀殿毓毽溢溯滓溶滂源溝滇滅溥溘溼溺溫滑準溜滄滔溪溧溴煎煙煩煤煉照煜煬煦煌煥煞煆煨煖爺牒猷獅猿猾瑯瑚瑕瑟瑞瑁琿瑙瑛瑜當畸瘀痰瘁痲痱痺痿痴痳盞盟睛睫睦睞督"], +["b840","睹睪睬睜睥睨睢矮碎碰碗碘碌碉硼碑碓硿祺祿禁萬禽稜稚稠稔稟稞窟窠筷節筠筮筧粱粳粵經絹綑綁綏絛置罩罪署義羨群聖聘肆肄腱腰腸腥腮腳腫"], +["b8a1","腹腺腦舅艇蒂葷落萱葵葦葫葉葬葛萼萵葡董葩葭葆虞虜號蛹蜓蜈蜇蜀蛾蛻蜂蜃蜆蜊衙裟裔裙補裘裝裡裊裕裒覜解詫該詳試詩詰誇詼詣誠話誅詭詢詮詬詹詻訾詨豢貊貉賊資賈賄貲賃賂賅跡跟跨路跳跺跪跤跦躲較載軾輊"], +["b940","辟農運遊道遂達逼違遐遇遏過遍遑逾遁鄒鄗酬酪酩釉鈷鉗鈸鈽鉀鈾鉛鉋鉤鉑鈴鉉鉍鉅鈹鈿鉚閘隘隔隕雍雋雉雊雷電雹零靖靴靶預頑頓頊頒頌飼飴"], +["b9a1","飽飾馳馱馴髡鳩麂鼎鼓鼠僧僮僥僖僭僚僕像僑僱僎僩兢凳劃劂匱厭嗾嘀嘛嘗嗽嘔嘆嘉嘍嘎嗷嘖嘟嘈嘐嗶團圖塵塾境墓墊塹墅塽壽夥夢夤奪奩嫡嫦嫩嫗嫖嫘嫣孵寞寧寡寥實寨寢寤察對屢嶄嶇幛幣幕幗幔廓廖弊彆彰徹慇"], +["ba40","愿態慷慢慣慟慚慘慵截撇摘摔撤摸摟摺摑摧搴摭摻敲斡旗旖暢暨暝榜榨榕槁榮槓構榛榷榻榫榴槐槍榭槌榦槃榣歉歌氳漳演滾漓滴漩漾漠漬漏漂漢"], +["baa1","滿滯漆漱漸漲漣漕漫漯澈漪滬漁滲滌滷熔熙煽熊熄熒爾犒犖獄獐瑤瑣瑪瑰瑭甄疑瘧瘍瘋瘉瘓盡監瞄睽睿睡磁碟碧碳碩碣禎福禍種稱窪窩竭端管箕箋筵算箝箔箏箸箇箄粹粽精綻綰綜綽綾綠緊綴網綱綺綢綿綵綸維緒緇綬"], +["bb40","罰翠翡翟聞聚肇腐膀膏膈膊腿膂臧臺與舔舞艋蓉蒿蓆蓄蒙蒞蒲蒜蓋蒸蓀蓓蒐蒼蓑蓊蜿蜜蜻蜢蜥蜴蜘蝕蜷蜩裳褂裴裹裸製裨褚裯誦誌語誣認誡誓誤"], +["bba1","說誥誨誘誑誚誧豪貍貌賓賑賒赫趙趕跼輔輒輕輓辣遠遘遜遣遙遞遢遝遛鄙鄘鄞酵酸酷酴鉸銀銅銘銖鉻銓銜銨鉼銑閡閨閩閣閥閤隙障際雌雒需靼鞅韶頗領颯颱餃餅餌餉駁骯骰髦魁魂鳴鳶鳳麼鼻齊億儀僻僵價儂儈儉儅凜"], +["bc40","劇劈劉劍劊勰厲嘮嘻嘹嘲嘿嘴嘩噓噎噗噴嘶嘯嘰墀墟增墳墜墮墩墦奭嬉嫻嬋嫵嬌嬈寮寬審寫層履嶝嶔幢幟幡廢廚廟廝廣廠彈影德徵慶慧慮慝慕憂"], +["bca1","慼慰慫慾憧憐憫憎憬憚憤憔憮戮摩摯摹撞撲撈撐撰撥撓撕撩撒撮播撫撚撬撙撢撳敵敷數暮暫暴暱樣樟槨樁樞標槽模樓樊槳樂樅槭樑歐歎殤毅毆漿潼澄潑潦潔澆潭潛潸潮澎潺潰潤澗潘滕潯潠潟熟熬熱熨牖犛獎獗瑩璋璃"], +["bd40","瑾璀畿瘠瘩瘟瘤瘦瘡瘢皚皺盤瞎瞇瞌瞑瞋磋磅確磊碾磕碼磐稿稼穀稽稷稻窯窮箭箱範箴篆篇篁箠篌糊締練緯緻緘緬緝編緣線緞緩綞緙緲緹罵罷羯"], +["bda1","翩耦膛膜膝膠膚膘蔗蔽蔚蓮蔬蔭蔓蔑蔣蔡蔔蓬蔥蓿蔆螂蝴蝶蝠蝦蝸蝨蝙蝗蝌蝓衛衝褐複褒褓褕褊誼諒談諄誕請諸課諉諂調誰論諍誶誹諛豌豎豬賠賞賦賤賬賭賢賣賜質賡赭趟趣踫踐踝踢踏踩踟踡踞躺輝輛輟輩輦輪輜輞"], +["be40","輥適遮遨遭遷鄰鄭鄧鄱醇醉醋醃鋅銻銷鋪銬鋤鋁銳銼鋒鋇鋰銲閭閱霄霆震霉靠鞍鞋鞏頡頫頜颳養餓餒餘駝駐駟駛駑駕駒駙骷髮髯鬧魅魄魷魯鴆鴉"], +["bea1","鴃麩麾黎墨齒儒儘儔儐儕冀冪凝劑劓勳噙噫噹噩噤噸噪器噥噱噯噬噢噶壁墾壇壅奮嬝嬴學寰導彊憲憑憩憊懍憶憾懊懈戰擅擁擋撻撼據擄擇擂操撿擒擔撾整曆曉暹曄曇暸樽樸樺橙橫橘樹橄橢橡橋橇樵機橈歙歷氅濂澱澡"], +["bf40","濃澤濁澧澳激澹澶澦澠澴熾燉燐燒燈燕熹燎燙燜燃燄獨璜璣璘璟璞瓢甌甍瘴瘸瘺盧盥瞠瞞瞟瞥磨磚磬磧禦積穎穆穌穋窺篙簑築篤篛篡篩篦糕糖縊"], +["bfa1","縑縈縛縣縞縝縉縐罹羲翰翱翮耨膳膩膨臻興艘艙蕊蕙蕈蕨蕩蕃蕉蕭蕪蕞螃螟螞螢融衡褪褲褥褫褡親覦諦諺諫諱謀諜諧諮諾謁謂諷諭諳諶諼豫豭貓賴蹄踱踴蹂踹踵輻輯輸輳辨辦遵遴選遲遼遺鄴醒錠錶鋸錳錯錢鋼錫錄錚"], +["c040","錐錦錡錕錮錙閻隧隨險雕霎霑霖霍霓霏靛靜靦鞘頰頸頻頷頭頹頤餐館餞餛餡餚駭駢駱骸骼髻髭鬨鮑鴕鴣鴦鴨鴒鴛默黔龍龜優償儡儲勵嚎嚀嚐嚅嚇"], +["c0a1","嚏壕壓壑壎嬰嬪嬤孺尷屨嶼嶺嶽嶸幫彌徽應懂懇懦懋戲戴擎擊擘擠擰擦擬擱擢擭斂斃曙曖檀檔檄檢檜櫛檣橾檗檐檠歜殮毚氈濘濱濟濠濛濤濫濯澀濬濡濩濕濮濰燧營燮燦燥燭燬燴燠爵牆獰獲璩環璦璨癆療癌盪瞳瞪瞰瞬"], +["c140","瞧瞭矯磷磺磴磯礁禧禪穗窿簇簍篾篷簌篠糠糜糞糢糟糙糝縮績繆縷縲繃縫總縱繅繁縴縹繈縵縿縯罄翳翼聱聲聰聯聳臆臃膺臂臀膿膽臉膾臨舉艱薪"], +["c1a1","薄蕾薜薑薔薯薛薇薨薊虧蟀蟑螳蟒蟆螫螻螺蟈蟋褻褶襄褸褽覬謎謗謙講謊謠謝謄謐豁谿豳賺賽購賸賻趨蹉蹋蹈蹊轄輾轂轅輿避遽還邁邂邀鄹醣醞醜鍍鎂錨鍵鍊鍥鍋錘鍾鍬鍛鍰鍚鍔闊闋闌闈闆隱隸雖霜霞鞠韓顆颶餵騁"], +["c240","駿鮮鮫鮪鮭鴻鴿麋黏點黜黝黛鼾齋叢嚕嚮壙壘嬸彝懣戳擴擲擾攆擺擻擷斷曜朦檳檬櫃檻檸櫂檮檯歟歸殯瀉瀋濾瀆濺瀑瀏燻燼燾燸獷獵璧璿甕癖癘"], +["c2a1","癒瞽瞿瞻瞼礎禮穡穢穠竄竅簫簧簪簞簣簡糧織繕繞繚繡繒繙罈翹翻職聶臍臏舊藏薩藍藐藉薰薺薹薦蟯蟬蟲蟠覆覲觴謨謹謬謫豐贅蹙蹣蹦蹤蹟蹕軀轉轍邇邃邈醫醬釐鎔鎊鎖鎢鎳鎮鎬鎰鎘鎚鎗闔闖闐闕離雜雙雛雞霤鞣鞦"], +["c340","鞭韹額顏題顎顓颺餾餿餽餮馥騎髁鬃鬆魏魎魍鯊鯉鯽鯈鯀鵑鵝鵠黠鼕鼬儳嚥壞壟壢寵龐廬懲懷懶懵攀攏曠曝櫥櫝櫚櫓瀛瀟瀨瀚瀝瀕瀘爆爍牘犢獸"], +["c3a1","獺璽瓊瓣疇疆癟癡矇礙禱穫穩簾簿簸簽簷籀繫繭繹繩繪羅繳羶羹羸臘藩藝藪藕藤藥藷蟻蠅蠍蟹蟾襠襟襖襞譁譜識證譚譎譏譆譙贈贊蹼蹲躇蹶蹬蹺蹴轔轎辭邊邋醱醮鏡鏑鏟鏃鏈鏜鏝鏖鏢鏍鏘鏤鏗鏨關隴難霪霧靡韜韻類"], +["c440","願顛颼饅饉騖騙鬍鯨鯧鯖鯛鶉鵡鵲鵪鵬麒麗麓麴勸嚨嚷嚶嚴嚼壤孀孃孽寶巉懸懺攘攔攙曦朧櫬瀾瀰瀲爐獻瓏癢癥礦礪礬礫竇競籌籃籍糯糰辮繽繼"], +["c4a1","纂罌耀臚艦藻藹蘑藺蘆蘋蘇蘊蠔蠕襤覺觸議譬警譯譟譫贏贍躉躁躅躂醴釋鐘鐃鏽闡霰飄饒饑馨騫騰騷騵鰓鰍鹹麵黨鼯齟齣齡儷儸囁囀囂夔屬巍懼懾攝攜斕曩櫻欄櫺殲灌爛犧瓖瓔癩矓籐纏續羼蘗蘭蘚蠣蠢蠡蠟襪襬覽譴"], +["c540","護譽贓躊躍躋轟辯醺鐮鐳鐵鐺鐸鐲鐫闢霸霹露響顧顥饗驅驃驀騾髏魔魑鰭鰥鶯鶴鷂鶸麝黯鼙齜齦齧儼儻囈囊囉孿巔巒彎懿攤權歡灑灘玀瓤疊癮癬"], +["c5a1","禳籠籟聾聽臟襲襯觼讀贖贗躑躓轡酈鑄鑑鑒霽霾韃韁顫饕驕驍髒鬚鱉鰱鰾鰻鷓鷗鼴齬齪龔囌巖戀攣攫攪曬欐瓚竊籤籣籥纓纖纔臢蘸蘿蠱變邐邏鑣鑠鑤靨顯饜驚驛驗髓體髑鱔鱗鱖鷥麟黴囑壩攬灞癱癲矗罐羈蠶蠹衢讓讒"], +["c640","讖艷贛釀鑪靂靈靄韆顰驟鬢魘鱟鷹鷺鹼鹽鼇齷齲廳欖灣籬籮蠻觀躡釁鑲鑰顱饞髖鬣黌灤矚讚鑷韉驢驥纜讜躪釅鑽鑾鑼鱷鱸黷豔鑿鸚爨驪鬱鸛鸞籲"], +["c940","乂乜凵匚厂万丌乇亍囗兀屮彳丏冇与丮亓仂仉仈冘勼卬厹圠夃夬尐巿旡殳毌气爿丱丼仨仜仩仡仝仚刌匜卌圢圣夗夯宁宄尒尻屴屳帄庀庂忉戉扐氕"], +["c9a1","氶汃氿氻犮犰玊禸肊阞伎优伬仵伔仱伀价伈伝伂伅伢伓伄仴伒冱刓刉刐劦匢匟卍厊吇囡囟圮圪圴夼妀奼妅奻奾奷奿孖尕尥屼屺屻屾巟幵庄异弚彴忕忔忏扜扞扤扡扦扢扙扠扚扥旯旮朾朹朸朻机朿朼朳氘汆汒汜汏汊汔汋"], +["ca40","汌灱牞犴犵玎甪癿穵网艸艼芀艽艿虍襾邙邗邘邛邔阢阤阠阣佖伻佢佉体佤伾佧佒佟佁佘伭伳伿佡冏冹刜刞刡劭劮匉卣卲厎厏吰吷吪呔呅吙吜吥吘"], +["caa1","吽呏呁吨吤呇囮囧囥坁坅坌坉坋坒夆奀妦妘妠妗妎妢妐妏妧妡宎宒尨尪岍岏岈岋岉岒岊岆岓岕巠帊帎庋庉庌庈庍弅弝彸彶忒忑忐忭忨忮忳忡忤忣忺忯忷忻怀忴戺抃抌抎抏抔抇扱扻扺扰抁抈扷扽扲扴攷旰旴旳旲旵杅杇"], +["cb40","杙杕杌杈杝杍杚杋毐氙氚汸汧汫沄沋沏汱汯汩沚汭沇沕沜汦汳汥汻沎灴灺牣犿犽狃狆狁犺狅玕玗玓玔玒町甹疔疕皁礽耴肕肙肐肒肜芐芏芅芎芑芓"], +["cba1","芊芃芄豸迉辿邟邡邥邞邧邠阰阨阯阭丳侘佼侅佽侀侇佶佴侉侄佷佌侗佪侚佹侁佸侐侜侔侞侒侂侕佫佮冞冼冾刵刲刳剆刱劼匊匋匼厒厔咇呿咁咑咂咈呫呺呾呥呬呴呦咍呯呡呠咘呣呧呤囷囹坯坲坭坫坱坰坶垀坵坻坳坴坢"], +["cc40","坨坽夌奅妵妺姏姎妲姌姁妶妼姃姖妱妽姀姈妴姇孢孥宓宕屄屇岮岤岠岵岯岨岬岟岣岭岢岪岧岝岥岶岰岦帗帔帙弨弢弣弤彔徂彾彽忞忥怭怦怙怲怋"], +["cca1","怴怊怗怳怚怞怬怢怍怐怮怓怑怌怉怜戔戽抭抴拑抾抪抶拊抮抳抯抻抩抰抸攽斨斻昉旼昄昒昈旻昃昋昍昅旽昑昐曶朊枅杬枎枒杶杻枘枆构杴枍枌杺枟枑枙枃杽极杸杹枔欥殀歾毞氝沓泬泫泮泙沶泔沭泧沷泐泂沺泃泆泭泲"], +["cd40","泒泝沴沊沝沀泞泀洰泍泇沰泹泏泩泑炔炘炅炓炆炄炑炖炂炚炃牪狖狋狘狉狜狒狔狚狌狑玤玡玭玦玢玠玬玝瓝瓨甿畀甾疌疘皯盳盱盰盵矸矼矹矻矺"], +["cda1","矷祂礿秅穸穻竻籵糽耵肏肮肣肸肵肭舠芠苀芫芚芘芛芵芧芮芼芞芺芴芨芡芩苂芤苃芶芢虰虯虭虮豖迒迋迓迍迖迕迗邲邴邯邳邰阹阽阼阺陃俍俅俓侲俉俋俁俔俜俙侻侳俛俇俖侺俀侹俬剄剉勀勂匽卼厗厖厙厘咺咡咭咥哏"], +["ce40","哃茍咷咮哖咶哅哆咠呰咼咢咾呲哞咰垵垞垟垤垌垗垝垛垔垘垏垙垥垚垕壴复奓姡姞姮娀姱姝姺姽姼姶姤姲姷姛姩姳姵姠姾姴姭宨屌峐峘峌峗峋峛"], +["cea1","峞峚峉峇峊峖峓峔峏峈峆峎峟峸巹帡帢帣帠帤庰庤庢庛庣庥弇弮彖徆怷怹恔恲恞恅恓恇恉恛恌恀恂恟怤恄恘恦恮扂扃拏挍挋拵挎挃拫拹挏挌拸拶挀挓挔拺挕拻拰敁敃斪斿昶昡昲昵昜昦昢昳昫昺昝昴昹昮朏朐柁柲柈枺"], +["cf40","柜枻柸柘柀枷柅柫柤柟枵柍枳柷柶柮柣柂枹柎柧柰枲柼柆柭柌枮柦柛柺柉柊柃柪柋欨殂殄殶毖毘毠氠氡洨洴洭洟洼洿洒洊泚洳洄洙洺洚洑洀洝浂"], +["cfa1","洁洘洷洃洏浀洇洠洬洈洢洉洐炷炟炾炱炰炡炴炵炩牁牉牊牬牰牳牮狊狤狨狫狟狪狦狣玅珌珂珈珅玹玶玵玴珫玿珇玾珃珆玸珋瓬瓮甮畇畈疧疪癹盄眈眃眄眅眊盷盻盺矧矨砆砑砒砅砐砏砎砉砃砓祊祌祋祅祄秕种秏秖秎窀"], +["d040","穾竑笀笁籺籸籹籿粀粁紃紈紁罘羑羍羾耇耎耏耔耷胘胇胠胑胈胂胐胅胣胙胜胊胕胉胏胗胦胍臿舡芔苙苾苹茇苨茀苕茺苫苖苴苬苡苲苵茌苻苶苰苪"], +["d0a1","苤苠苺苳苭虷虴虼虳衁衎衧衪衩觓訄訇赲迣迡迮迠郱邽邿郕郅邾郇郋郈釔釓陔陏陑陓陊陎倞倅倇倓倢倰倛俵俴倳倷倬俶俷倗倜倠倧倵倯倱倎党冔冓凊凄凅凈凎剡剚剒剞剟剕剢勍匎厞唦哢唗唒哧哳哤唚哿唄唈哫唑唅哱"], +["d140","唊哻哷哸哠唎唃唋圁圂埌堲埕埒垺埆垽垼垸垶垿埇埐垹埁夎奊娙娖娭娮娕娏娗娊娞娳孬宧宭宬尃屖屔峬峿峮峱峷崀峹帩帨庨庮庪庬弳弰彧恝恚恧"], +["d1a1","恁悢悈悀悒悁悝悃悕悛悗悇悜悎戙扆拲挐捖挬捄捅挶捃揤挹捋捊挼挩捁挴捘捔捙挭捇挳捚捑挸捗捀捈敊敆旆旃旄旂晊晟晇晑朒朓栟栚桉栲栳栻桋桏栖栱栜栵栫栭栯桎桄栴栝栒栔栦栨栮桍栺栥栠欬欯欭欱欴歭肂殈毦毤"], +["d240","毨毣毢毧氥浺浣浤浶洍浡涒浘浢浭浯涑涍淯浿涆浞浧浠涗浰浼浟涂涘洯浨涋浾涀涄洖涃浻浽浵涐烜烓烑烝烋缹烢烗烒烞烠烔烍烅烆烇烚烎烡牂牸"], +["d2a1","牷牶猀狺狴狾狶狳狻猁珓珙珥珖玼珧珣珩珜珒珛珔珝珚珗珘珨瓞瓟瓴瓵甡畛畟疰痁疻痄痀疿疶疺皊盉眝眛眐眓眒眣眑眕眙眚眢眧砣砬砢砵砯砨砮砫砡砩砳砪砱祔祛祏祜祓祒祑秫秬秠秮秭秪秜秞秝窆窉窅窋窌窊窇竘笐"], +["d340","笄笓笅笏笈笊笎笉笒粄粑粊粌粈粍粅紞紝紑紎紘紖紓紟紒紏紌罜罡罞罠罝罛羖羒翃翂翀耖耾耹胺胲胹胵脁胻脀舁舯舥茳茭荄茙荑茥荖茿荁茦茜茢"], +["d3a1","荂荎茛茪茈茼荍茖茤茠茷茯茩荇荅荌荓茞茬荋茧荈虓虒蚢蚨蚖蚍蚑蚞蚇蚗蚆蚋蚚蚅蚥蚙蚡蚧蚕蚘蚎蚝蚐蚔衃衄衭衵衶衲袀衱衿衯袃衾衴衼訒豇豗豻貤貣赶赸趵趷趶軑軓迾迵适迿迻逄迼迶郖郠郙郚郣郟郥郘郛郗郜郤酐"], +["d440","酎酏釕釢釚陜陟隼飣髟鬯乿偰偪偡偞偠偓偋偝偲偈偍偁偛偊偢倕偅偟偩偫偣偤偆偀偮偳偗偑凐剫剭剬剮勖勓匭厜啵啶唼啍啐唴唪啑啢唶唵唰啒啅"], +["d4a1","唌唲啥啎唹啈唭唻啀啋圊圇埻堔埢埶埜埴堀埭埽堈埸堋埳埏堇埮埣埲埥埬埡堎埼堐埧堁堌埱埩埰堍堄奜婠婘婕婧婞娸娵婭婐婟婥婬婓婤婗婃婝婒婄婛婈媎娾婍娹婌婰婩婇婑婖婂婜孲孮寁寀屙崞崋崝崚崠崌崨崍崦崥崏"], +["d540","崰崒崣崟崮帾帴庱庴庹庲庳弶弸徛徖徟悊悐悆悾悰悺惓惔惏惤惙惝惈悱惛悷惊悿惃惍惀挲捥掊掂捽掽掞掭掝掗掫掎捯掇掐据掯捵掜捭掮捼掤挻掟"], +["d5a1","捸掅掁掑掍捰敓旍晥晡晛晙晜晢朘桹梇梐梜桭桮梮梫楖桯梣梬梩桵桴梲梏桷梒桼桫桲梪梀桱桾梛梖梋梠梉梤桸桻梑梌梊桽欶欳欷欸殑殏殍殎殌氪淀涫涴涳湴涬淩淢涷淶淔渀淈淠淟淖涾淥淜淝淛淴淊涽淭淰涺淕淂淏淉"], +["d640","淐淲淓淽淗淍淣涻烺焍烷焗烴焌烰焄烳焐烼烿焆焓焀烸烶焋焂焎牾牻牼牿猝猗猇猑猘猊猈狿猏猞玈珶珸珵琄琁珽琇琀珺珼珿琌琋珴琈畤畣痎痒痏"], +["d6a1","痋痌痑痐皏皉盓眹眯眭眱眲眴眳眽眥眻眵硈硒硉硍硊硌砦硅硐祤祧祩祪祣祫祡离秺秸秶秷窏窔窐笵筇笴笥笰笢笤笳笘笪笝笱笫笭笯笲笸笚笣粔粘粖粣紵紽紸紶紺絅紬紩絁絇紾紿絊紻紨罣羕羜羝羛翊翋翍翐翑翇翏翉耟"], +["d740","耞耛聇聃聈脘脥脙脛脭脟脬脞脡脕脧脝脢舑舸舳舺舴舲艴莐莣莨莍荺荳莤荴莏莁莕莙荵莔莩荽莃莌莝莛莪莋荾莥莯莈莗莰荿莦莇莮荶莚虙虖蚿蚷"], +["d7a1","蛂蛁蛅蚺蚰蛈蚹蚳蚸蛌蚴蚻蚼蛃蚽蚾衒袉袕袨袢袪袚袑袡袟袘袧袙袛袗袤袬袌袓袎覂觖觙觕訰訧訬訞谹谻豜豝豽貥赽赻赹趼跂趹趿跁軘軞軝軜軗軠軡逤逋逑逜逌逡郯郪郰郴郲郳郔郫郬郩酖酘酚酓酕釬釴釱釳釸釤釹釪"], +["d840","釫釷釨釮镺閆閈陼陭陫陱陯隿靪頄飥馗傛傕傔傞傋傣傃傌傎傝偨傜傒傂傇兟凔匒匑厤厧喑喨喥喭啷噅喢喓喈喏喵喁喣喒喤啽喌喦啿喕喡喎圌堩堷"], +["d8a1","堙堞堧堣堨埵塈堥堜堛堳堿堶堮堹堸堭堬堻奡媯媔媟婺媢媞婸媦婼媥媬媕媮娷媄媊媗媃媋媩婻婽媌媜媏媓媝寪寍寋寔寑寊寎尌尰崷嵃嵫嵁嵋崿崵嵑嵎嵕崳崺嵒崽崱嵙嵂崹嵉崸崼崲崶嵀嵅幄幁彘徦徥徫惉悹惌惢惎惄愔"], +["d940","惲愊愖愅惵愓惸惼惾惁愃愘愝愐惿愄愋扊掔掱掰揎揥揨揯揃撝揳揊揠揶揕揲揵摡揟掾揝揜揄揘揓揂揇揌揋揈揰揗揙攲敧敪敤敜敨敥斌斝斞斮旐旒"], +["d9a1","晼晬晻暀晱晹晪晲朁椌棓椄棜椪棬棪棱椏棖棷棫棤棶椓椐棳棡椇棌椈楰梴椑棯棆椔棸棐棽棼棨椋椊椗棎棈棝棞棦棴棑椆棔棩椕椥棇欹欻欿欼殔殗殙殕殽毰毲毳氰淼湆湇渟湉溈渼渽湅湢渫渿湁湝湳渜渳湋湀湑渻渃渮湞"], +["da40","湨湜湡渱渨湠湱湫渹渢渰湓湥渧湸湤湷湕湹湒湦渵渶湚焠焞焯烻焮焱焣焥焢焲焟焨焺焛牋牚犈犉犆犅犋猒猋猰猢猱猳猧猲猭猦猣猵猌琮琬琰琫琖"], +["daa1","琚琡琭琱琤琣琝琩琠琲瓻甯畯畬痧痚痡痦痝痟痤痗皕皒盚睆睇睄睍睅睊睎睋睌矞矬硠硤硥硜硭硱硪确硰硩硨硞硢祴祳祲祰稂稊稃稌稄窙竦竤筊笻筄筈筌筎筀筘筅粢粞粨粡絘絯絣絓絖絧絪絏絭絜絫絒絔絩絑絟絎缾缿罥"], +["db40","罦羢羠羡翗聑聏聐胾胔腃腊腒腏腇脽腍脺臦臮臷臸臹舄舼舽舿艵茻菏菹萣菀菨萒菧菤菼菶萐菆菈菫菣莿萁菝菥菘菿菡菋菎菖菵菉萉萏菞萑萆菂菳"], +["dba1","菕菺菇菑菪萓菃菬菮菄菻菗菢萛菛菾蛘蛢蛦蛓蛣蛚蛪蛝蛫蛜蛬蛩蛗蛨蛑衈衖衕袺裗袹袸裀袾袶袼袷袽袲褁裉覕覘覗觝觚觛詎詍訹詙詀詗詘詄詅詒詈詑詊詌詏豟貁貀貺貾貰貹貵趄趀趉跘跓跍跇跖跜跏跕跙跈跗跅軯軷軺"], +["dc40","軹軦軮軥軵軧軨軶軫軱軬軴軩逭逴逯鄆鄬鄄郿郼鄈郹郻鄁鄀鄇鄅鄃酡酤酟酢酠鈁鈊鈥鈃鈚鈦鈏鈌鈀鈒釿釽鈆鈄鈧鈂鈜鈤鈙鈗鈅鈖镻閍閌閐隇陾隈"], +["dca1","隉隃隀雂雈雃雱雰靬靰靮頇颩飫鳦黹亃亄亶傽傿僆傮僄僊傴僈僂傰僁傺傱僋僉傶傸凗剺剸剻剼嗃嗛嗌嗐嗋嗊嗝嗀嗔嗄嗩喿嗒喍嗏嗕嗢嗖嗈嗲嗍嗙嗂圔塓塨塤塏塍塉塯塕塎塝塙塥塛堽塣塱壼嫇嫄嫋媺媸媱媵媰媿嫈媻嫆"], +["dd40","媷嫀嫊媴媶嫍媹媐寖寘寙尟尳嵱嵣嵊嵥嵲嵬嵞嵨嵧嵢巰幏幎幊幍幋廅廌廆廋廇彀徯徭惷慉慊愫慅愶愲愮慆愯慏愩慀戠酨戣戥戤揅揱揫搐搒搉搠搤"], +["dda1","搳摃搟搕搘搹搷搢搣搌搦搰搨摁搵搯搊搚摀搥搧搋揧搛搮搡搎敯斒旓暆暌暕暐暋暊暙暔晸朠楦楟椸楎楢楱椿楅楪椹楂楗楙楺楈楉椵楬椳椽楥棰楸椴楩楀楯楄楶楘楁楴楌椻楋椷楜楏楑椲楒椯楻椼歆歅歃歂歈歁殛嗀毻毼"], +["de40","毹毷毸溛滖滈溏滀溟溓溔溠溱溹滆滒溽滁溞滉溷溰滍溦滏溲溾滃滜滘溙溒溎溍溤溡溿溳滐滊溗溮溣煇煔煒煣煠煁煝煢煲煸煪煡煂煘煃煋煰煟煐煓"], +["dea1","煄煍煚牏犍犌犑犐犎猼獂猻猺獀獊獉瑄瑊瑋瑒瑑瑗瑀瑏瑐瑎瑂瑆瑍瑔瓡瓿瓾瓽甝畹畷榃痯瘏瘃痷痾痼痹痸瘐痻痶痭痵痽皙皵盝睕睟睠睒睖睚睩睧睔睙睭矠碇碚碔碏碄碕碅碆碡碃硹碙碀碖硻祼禂祽祹稑稘稙稒稗稕稢稓"], +["df40","稛稐窣窢窞竫筦筤筭筴筩筲筥筳筱筰筡筸筶筣粲粴粯綈綆綀綍絿綅絺綎絻綃絼綌綔綄絽綒罭罫罧罨罬羦羥羧翛翜耡腤腠腷腜腩腛腢腲朡腞腶腧腯"], +["dfa1","腄腡舝艉艄艀艂艅蓱萿葖葶葹蒏蒍葥葑葀蒆葧萰葍葽葚葙葴葳葝蔇葞萷萺萴葺葃葸萲葅萩菙葋萯葂萭葟葰萹葎葌葒葯蓅蒎萻葇萶萳葨葾葄萫葠葔葮葐蜋蜄蛷蜌蛺蛖蛵蝍蛸蜎蜉蜁蛶蜍蜅裖裋裍裎裞裛裚裌裐覅覛觟觥觤"], +["e040","觡觠觢觜触詶誆詿詡訿詷誂誄詵誃誁詴詺谼豋豊豥豤豦貆貄貅賌赨赩趑趌趎趏趍趓趔趐趒跰跠跬跱跮跐跩跣跢跧跲跫跴輆軿輁輀輅輇輈輂輋遒逿"], +["e0a1","遄遉逽鄐鄍鄏鄑鄖鄔鄋鄎酮酯鉈鉒鈰鈺鉦鈳鉥鉞銃鈮鉊鉆鉭鉬鉏鉠鉧鉯鈶鉡鉰鈱鉔鉣鉐鉲鉎鉓鉌鉖鈲閟閜閞閛隒隓隑隗雎雺雽雸雵靳靷靸靲頏頍頎颬飶飹馯馲馰馵骭骫魛鳪鳭鳧麀黽僦僔僗僨僳僛僪僝僤僓僬僰僯僣僠"], +["e140","凘劀劁勩勫匰厬嘧嘕嘌嘒嗼嘏嘜嘁嘓嘂嗺嘝嘄嗿嗹墉塼墐墘墆墁塿塴墋塺墇墑墎塶墂墈塻墔墏壾奫嫜嫮嫥嫕嫪嫚嫭嫫嫳嫢嫠嫛嫬嫞嫝嫙嫨嫟孷寠"], +["e1a1","寣屣嶂嶀嵽嶆嵺嶁嵷嶊嶉嶈嵾嵼嶍嵹嵿幘幙幓廘廑廗廎廜廕廙廒廔彄彃彯徶愬愨慁慞慱慳慒慓慲慬憀慴慔慺慛慥愻慪慡慖戩戧戫搫摍摛摝摴摶摲摳摽摵摦撦摎撂摞摜摋摓摠摐摿搿摬摫摙摥摷敳斠暡暠暟朅朄朢榱榶槉"], +["e240","榠槎榖榰榬榼榑榙榎榧榍榩榾榯榿槄榽榤槔榹槊榚槏榳榓榪榡榞槙榗榐槂榵榥槆歊歍歋殞殟殠毃毄毾滎滵滱漃漥滸漷滻漮漉潎漙漚漧漘漻漒滭漊"], +["e2a1","漶潳滹滮漭潀漰漼漵滫漇漎潃漅滽滶漹漜滼漺漟漍漞漈漡熇熐熉熀熅熂熏煻熆熁熗牄牓犗犕犓獃獍獑獌瑢瑳瑱瑵瑲瑧瑮甀甂甃畽疐瘖瘈瘌瘕瘑瘊瘔皸瞁睼瞅瞂睮瞀睯睾瞃碲碪碴碭碨硾碫碞碥碠碬碢碤禘禊禋禖禕禔禓"], +["e340","禗禈禒禐稫穊稰稯稨稦窨窫窬竮箈箜箊箑箐箖箍箌箛箎箅箘劄箙箤箂粻粿粼粺綧綷緂綣綪緁緀緅綝緎緄緆緋緌綯綹綖綼綟綦綮綩綡緉罳翢翣翥翞"], +["e3a1","耤聝聜膉膆膃膇膍膌膋舕蒗蒤蒡蒟蒺蓎蓂蒬蒮蒫蒹蒴蓁蓍蒪蒚蒱蓐蒝蒧蒻蒢蒔蓇蓌蒛蒩蒯蒨蓖蒘蒶蓏蒠蓗蓔蓒蓛蒰蒑虡蜳蜣蜨蝫蝀蜮蜞蜡蜙蜛蝃蜬蝁蜾蝆蜠蜲蜪蜭蜼蜒蜺蜱蜵蝂蜦蜧蜸蜤蜚蜰蜑裷裧裱裲裺裾裮裼裶裻"], +["e440","裰裬裫覝覡覟覞觩觫觨誫誙誋誒誏誖谽豨豩賕賏賗趖踉踂跿踍跽踊踃踇踆踅跾踀踄輐輑輎輍鄣鄜鄠鄢鄟鄝鄚鄤鄡鄛酺酲酹酳銥銤鉶銛鉺銠銔銪銍"], +["e4a1","銦銚銫鉹銗鉿銣鋮銎銂銕銢鉽銈銡銊銆銌銙銧鉾銇銩銝銋鈭隞隡雿靘靽靺靾鞃鞀鞂靻鞄鞁靿韎韍頖颭颮餂餀餇馝馜駃馹馻馺駂馽駇骱髣髧鬾鬿魠魡魟鳱鳲鳵麧僿儃儰僸儆儇僶僾儋儌僽儊劋劌勱勯噈噂噌嘵噁噊噉噆噘"], +["e540","噚噀嘳嘽嘬嘾嘸嘪嘺圚墫墝墱墠墣墯墬墥墡壿嫿嫴嫽嫷嫶嬃嫸嬂嫹嬁嬇嬅嬏屧嶙嶗嶟嶒嶢嶓嶕嶠嶜嶡嶚嶞幩幝幠幜緳廛廞廡彉徲憋憃慹憱憰憢憉"], +["e5a1","憛憓憯憭憟憒憪憡憍慦憳戭摮摰撖撠撅撗撜撏撋撊撌撣撟摨撱撘敶敺敹敻斲斳暵暰暩暲暷暪暯樀樆樗槥槸樕槱槤樠槿槬槢樛樝槾樧槲槮樔槷槧橀樈槦槻樍槼槫樉樄樘樥樏槶樦樇槴樖歑殥殣殢殦氁氀毿氂潁漦潾澇濆澒"], +["e640","澍澉澌潢潏澅潚澖潶潬澂潕潲潒潐潗澔澓潝漀潡潫潽潧澐潓澋潩潿澕潣潷潪潻熲熯熛熰熠熚熩熵熝熥熞熤熡熪熜熧熳犘犚獘獒獞獟獠獝獛獡獚獙"], +["e6a1","獢璇璉璊璆璁瑽璅璈瑼瑹甈甇畾瘥瘞瘙瘝瘜瘣瘚瘨瘛皜皝皞皛瞍瞏瞉瞈磍碻磏磌磑磎磔磈磃磄磉禚禡禠禜禢禛歶稹窲窴窳箷篋箾箬篎箯箹篊箵糅糈糌糋緷緛緪緧緗緡縃緺緦緶緱緰緮緟罶羬羰羭翭翫翪翬翦翨聤聧膣膟"], +["e740","膞膕膢膙膗舖艏艓艒艐艎艑蔤蔻蔏蔀蔩蔎蔉蔍蔟蔊蔧蔜蓻蔫蓺蔈蔌蓴蔪蓲蔕蓷蓫蓳蓼蔒蓪蓩蔖蓾蔨蔝蔮蔂蓽蔞蓶蔱蔦蓧蓨蓰蓯蓹蔘蔠蔰蔋蔙蔯虢"], +["e7a1","蝖蝣蝤蝷蟡蝳蝘蝔蝛蝒蝡蝚蝑蝞蝭蝪蝐蝎蝟蝝蝯蝬蝺蝮蝜蝥蝏蝻蝵蝢蝧蝩衚褅褌褔褋褗褘褙褆褖褑褎褉覢覤覣觭觰觬諏諆誸諓諑諔諕誻諗誾諀諅諘諃誺誽諙谾豍貏賥賟賙賨賚賝賧趠趜趡趛踠踣踥踤踮踕踛踖踑踙踦踧"], +["e840","踔踒踘踓踜踗踚輬輤輘輚輠輣輖輗遳遰遯遧遫鄯鄫鄩鄪鄲鄦鄮醅醆醊醁醂醄醀鋐鋃鋄鋀鋙銶鋏鋱鋟鋘鋩鋗鋝鋌鋯鋂鋨鋊鋈鋎鋦鋍鋕鋉鋠鋞鋧鋑鋓"], +["e8a1","銵鋡鋆銴镼閬閫閮閰隤隢雓霅霈霂靚鞊鞎鞈韐韏頞頝頦頩頨頠頛頧颲餈飺餑餔餖餗餕駜駍駏駓駔駎駉駖駘駋駗駌骳髬髫髳髲髱魆魃魧魴魱魦魶魵魰魨魤魬鳼鳺鳽鳿鳷鴇鴀鳹鳻鴈鴅鴄麃黓鼏鼐儜儓儗儚儑凞匴叡噰噠噮"], +["e940","噳噦噣噭噲噞噷圜圛壈墽壉墿墺壂墼壆嬗嬙嬛嬡嬔嬓嬐嬖嬨嬚嬠嬞寯嶬嶱嶩嶧嶵嶰嶮嶪嶨嶲嶭嶯嶴幧幨幦幯廩廧廦廨廥彋徼憝憨憖懅憴懆懁懌憺"], +["e9a1","憿憸憌擗擖擐擏擉撽撉擃擛擳擙攳敿敼斢曈暾曀曊曋曏暽暻暺曌朣樴橦橉橧樲橨樾橝橭橶橛橑樨橚樻樿橁橪橤橐橏橔橯橩橠樼橞橖橕橍橎橆歕歔歖殧殪殫毈毇氄氃氆澭濋澣濇澼濎濈潞濄澽澞濊澨瀄澥澮澺澬澪濏澿澸"], +["ea40","澢濉澫濍澯澲澰燅燂熿熸燖燀燁燋燔燊燇燏熽燘熼燆燚燛犝犞獩獦獧獬獥獫獪瑿璚璠璔璒璕璡甋疀瘯瘭瘱瘽瘳瘼瘵瘲瘰皻盦瞚瞝瞡瞜瞛瞢瞣瞕瞙"], +["eaa1","瞗磝磩磥磪磞磣磛磡磢磭磟磠禤穄穈穇窶窸窵窱窷篞篣篧篝篕篥篚篨篹篔篪篢篜篫篘篟糒糔糗糐糑縒縡縗縌縟縠縓縎縜縕縚縢縋縏縖縍縔縥縤罃罻罼罺羱翯耪耩聬膱膦膮膹膵膫膰膬膴膲膷膧臲艕艖艗蕖蕅蕫蕍蕓蕡蕘"], +["eb40","蕀蕆蕤蕁蕢蕄蕑蕇蕣蔾蕛蕱蕎蕮蕵蕕蕧蕠薌蕦蕝蕔蕥蕬虣虥虤螛螏螗螓螒螈螁螖螘蝹螇螣螅螐螑螝螄螔螜螚螉褞褦褰褭褮褧褱褢褩褣褯褬褟觱諠"], +["eba1","諢諲諴諵諝謔諤諟諰諈諞諡諨諿諯諻貑貒貐賵賮賱賰賳赬赮趥趧踳踾踸蹀蹅踶踼踽蹁踰踿躽輶輮輵輲輹輷輴遶遹遻邆郺鄳鄵鄶醓醐醑醍醏錧錞錈錟錆錏鍺錸錼錛錣錒錁鍆錭錎錍鋋錝鋺錥錓鋹鋷錴錂錤鋿錩錹錵錪錔錌"], +["ec40","錋鋾錉錀鋻錖閼闍閾閹閺閶閿閵閽隩雔霋霒霐鞙鞗鞔韰韸頵頯頲餤餟餧餩馞駮駬駥駤駰駣駪駩駧骹骿骴骻髶髺髹髷鬳鮀鮅鮇魼魾魻鮂鮓鮒鮐魺鮕"], +["eca1","魽鮈鴥鴗鴠鴞鴔鴩鴝鴘鴢鴐鴙鴟麈麆麇麮麭黕黖黺鼒鼽儦儥儢儤儠儩勴嚓嚌嚍嚆嚄嚃噾嚂噿嚁壖壔壏壒嬭嬥嬲嬣嬬嬧嬦嬯嬮孻寱寲嶷幬幪徾徻懃憵憼懧懠懥懤懨懞擯擩擣擫擤擨斁斀斶旚曒檍檖檁檥檉檟檛檡檞檇檓檎"], +["ed40","檕檃檨檤檑橿檦檚檅檌檒歛殭氉濌澩濴濔濣濜濭濧濦濞濲濝濢濨燡燱燨燲燤燰燢獳獮獯璗璲璫璐璪璭璱璥璯甐甑甒甏疄癃癈癉癇皤盩瞵瞫瞲瞷瞶"], +["eda1","瞴瞱瞨矰磳磽礂磻磼磲礅磹磾礄禫禨穜穛穖穘穔穚窾竀竁簅簏篲簀篿篻簎篴簋篳簂簉簃簁篸篽簆篰篱簐簊糨縭縼繂縳顈縸縪繉繀繇縩繌縰縻縶繄縺罅罿罾罽翴翲耬膻臄臌臊臅臇膼臩艛艚艜薃薀薏薧薕薠薋薣蕻薤薚薞"], +["ee40","蕷蕼薉薡蕺蕸蕗薎薖薆薍薙薝薁薢薂薈薅蕹蕶薘薐薟虨螾螪螭蟅螰螬螹螵螼螮蟉蟃蟂蟌螷螯蟄蟊螴螶螿螸螽蟞螲褵褳褼褾襁襒褷襂覭覯覮觲觳謞"], +["eea1","謘謖謑謅謋謢謏謒謕謇謍謈謆謜謓謚豏豰豲豱豯貕貔賹赯蹎蹍蹓蹐蹌蹇轃轀邅遾鄸醚醢醛醙醟醡醝醠鎡鎃鎯鍤鍖鍇鍼鍘鍜鍶鍉鍐鍑鍠鍭鎏鍌鍪鍹鍗鍕鍒鍏鍱鍷鍻鍡鍞鍣鍧鎀鍎鍙闇闀闉闃闅閷隮隰隬霠霟霘霝霙鞚鞡鞜"], +["ef40","鞞鞝韕韔韱顁顄顊顉顅顃餥餫餬餪餳餲餯餭餱餰馘馣馡騂駺駴駷駹駸駶駻駽駾駼騃骾髾髽鬁髼魈鮚鮨鮞鮛鮦鮡鮥鮤鮆鮢鮠鮯鴳鵁鵧鴶鴮鴯鴱鴸鴰"], +["efa1","鵅鵂鵃鴾鴷鵀鴽翵鴭麊麉麍麰黈黚黻黿鼤鼣鼢齔龠儱儭儮嚘嚜嚗嚚嚝嚙奰嬼屩屪巀幭幮懘懟懭懮懱懪懰懫懖懩擿攄擽擸攁攃擼斔旛曚曛曘櫅檹檽櫡櫆檺檶檷櫇檴檭歞毉氋瀇瀌瀍瀁瀅瀔瀎濿瀀濻瀦濼濷瀊爁燿燹爃燽獶"], +["f040","璸瓀璵瓁璾璶璻瓂甔甓癜癤癙癐癓癗癚皦皽盬矂瞺磿礌礓礔礉礐礒礑禭禬穟簜簩簙簠簟簭簝簦簨簢簥簰繜繐繖繣繘繢繟繑繠繗繓羵羳翷翸聵臑臒"], +["f0a1","臐艟艞薴藆藀藃藂薳薵薽藇藄薿藋藎藈藅薱薶藒蘤薸薷薾虩蟧蟦蟢蟛蟫蟪蟥蟟蟳蟤蟔蟜蟓蟭蟘蟣螤蟗蟙蠁蟴蟨蟝襓襋襏襌襆襐襑襉謪謧謣謳謰謵譇謯謼謾謱謥謷謦謶謮謤謻謽謺豂豵貙貘貗賾贄贂贀蹜蹢蹠蹗蹖蹞蹥蹧"], +["f140","蹛蹚蹡蹝蹩蹔轆轇轈轋鄨鄺鄻鄾醨醥醧醯醪鎵鎌鎒鎷鎛鎝鎉鎧鎎鎪鎞鎦鎕鎈鎙鎟鎍鎱鎑鎲鎤鎨鎴鎣鎥闒闓闑隳雗雚巂雟雘雝霣霢霥鞬鞮鞨鞫鞤鞪"], +["f1a1","鞢鞥韗韙韖韘韺顐顑顒颸饁餼餺騏騋騉騍騄騑騊騅騇騆髀髜鬈鬄鬅鬩鬵魊魌魋鯇鯆鯃鮿鯁鮵鮸鯓鮶鯄鮹鮽鵜鵓鵏鵊鵛鵋鵙鵖鵌鵗鵒鵔鵟鵘鵚麎麌黟鼁鼀鼖鼥鼫鼪鼩鼨齌齕儴儵劖勷厴嚫嚭嚦嚧嚪嚬壚壝壛夒嬽嬾嬿巃幰"], +["f240","徿懻攇攐攍攉攌攎斄旞旝曞櫧櫠櫌櫑櫙櫋櫟櫜櫐櫫櫏櫍櫞歠殰氌瀙瀧瀠瀖瀫瀡瀢瀣瀩瀗瀤瀜瀪爌爊爇爂爅犥犦犤犣犡瓋瓅璷瓃甖癠矉矊矄矱礝礛"], +["f2a1","礡礜礗礞禰穧穨簳簼簹簬簻糬糪繶繵繸繰繷繯繺繲繴繨罋罊羃羆羷翽翾聸臗臕艤艡艣藫藱藭藙藡藨藚藗藬藲藸藘藟藣藜藑藰藦藯藞藢蠀蟺蠃蟶蟷蠉蠌蠋蠆蟼蠈蟿蠊蠂襢襚襛襗襡襜襘襝襙覈覷覶觶譐譈譊譀譓譖譔譋譕"], +["f340","譑譂譒譗豃豷豶貚贆贇贉趬趪趭趫蹭蹸蹳蹪蹯蹻軂轒轑轏轐轓辴酀鄿醰醭鏞鏇鏏鏂鏚鏐鏹鏬鏌鏙鎩鏦鏊鏔鏮鏣鏕鏄鏎鏀鏒鏧镽闚闛雡霩霫霬霨霦"], +["f3a1","鞳鞷鞶韝韞韟顜顙顝顗颿颽颻颾饈饇饃馦馧騚騕騥騝騤騛騢騠騧騣騞騜騔髂鬋鬊鬎鬌鬷鯪鯫鯠鯞鯤鯦鯢鯰鯔鯗鯬鯜鯙鯥鯕鯡鯚鵷鶁鶊鶄鶈鵱鶀鵸鶆鶋鶌鵽鵫鵴鵵鵰鵩鶅鵳鵻鶂鵯鵹鵿鶇鵨麔麑黀黼鼭齀齁齍齖齗齘匷嚲"], +["f440","嚵嚳壣孅巆巇廮廯忀忁懹攗攖攕攓旟曨曣曤櫳櫰櫪櫨櫹櫱櫮櫯瀼瀵瀯瀷瀴瀱灂瀸瀿瀺瀹灀瀻瀳灁爓爔犨獽獼璺皫皪皾盭矌矎矏矍矲礥礣礧礨礤礩"], +["f4a1","禲穮穬穭竷籉籈籊籇籅糮繻繾纁纀羺翿聹臛臙舋艨艩蘢藿蘁藾蘛蘀藶蘄蘉蘅蘌藽蠙蠐蠑蠗蠓蠖襣襦覹觷譠譪譝譨譣譥譧譭趮躆躈躄轙轖轗轕轘轚邍酃酁醷醵醲醳鐋鐓鏻鐠鐏鐔鏾鐕鐐鐨鐙鐍鏵鐀鏷鐇鐎鐖鐒鏺鐉鏸鐊鏿"], +["f540","鏼鐌鏶鐑鐆闞闠闟霮霯鞹鞻韽韾顠顢顣顟飁飂饐饎饙饌饋饓騲騴騱騬騪騶騩騮騸騭髇髊髆鬐鬒鬑鰋鰈鯷鰅鰒鯸鱀鰇鰎鰆鰗鰔鰉鶟鶙鶤鶝鶒鶘鶐鶛"], +["f5a1","鶠鶔鶜鶪鶗鶡鶚鶢鶨鶞鶣鶿鶩鶖鶦鶧麙麛麚黥黤黧黦鼰鼮齛齠齞齝齙龑儺儹劘劗囃嚽嚾孈孇巋巏廱懽攛欂櫼欃櫸欀灃灄灊灈灉灅灆爝爚爙獾甗癪矐礭礱礯籔籓糲纊纇纈纋纆纍罍羻耰臝蘘蘪蘦蘟蘣蘜蘙蘧蘮蘡蘠蘩蘞蘥"], +["f640","蠩蠝蠛蠠蠤蠜蠫衊襭襩襮襫觺譹譸譅譺譻贐贔趯躎躌轞轛轝酆酄酅醹鐿鐻鐶鐩鐽鐼鐰鐹鐪鐷鐬鑀鐱闥闤闣霵霺鞿韡顤飉飆飀饘饖騹騽驆驄驂驁騺"], +["f6a1","騿髍鬕鬗鬘鬖鬺魒鰫鰝鰜鰬鰣鰨鰩鰤鰡鶷鶶鶼鷁鷇鷊鷏鶾鷅鷃鶻鶵鷎鶹鶺鶬鷈鶱鶭鷌鶳鷍鶲鹺麜黫黮黭鼛鼘鼚鼱齎齥齤龒亹囆囅囋奱孋孌巕巑廲攡攠攦攢欋欈欉氍灕灖灗灒爞爟犩獿瓘瓕瓙瓗癭皭礵禴穰穱籗籜籙籛籚"], +["f740","糴糱纑罏羇臞艫蘴蘵蘳蘬蘲蘶蠬蠨蠦蠪蠥襱覿覾觻譾讄讂讆讅譿贕躕躔躚躒躐躖躗轠轢酇鑌鑐鑊鑋鑏鑇鑅鑈鑉鑆霿韣顪顩飋饔饛驎驓驔驌驏驈驊"], +["f7a1","驉驒驐髐鬙鬫鬻魖魕鱆鱈鰿鱄鰹鰳鱁鰼鰷鰴鰲鰽鰶鷛鷒鷞鷚鷋鷐鷜鷑鷟鷩鷙鷘鷖鷵鷕鷝麶黰鼵鼳鼲齂齫龕龢儽劙壨壧奲孍巘蠯彏戁戃戄攩攥斖曫欑欒欏毊灛灚爢玂玁玃癰矔籧籦纕艬蘺虀蘹蘼蘱蘻蘾蠰蠲蠮蠳襶襴襳觾"], +["f840","讌讎讋讈豅贙躘轤轣醼鑢鑕鑝鑗鑞韄韅頀驖驙鬞鬟鬠鱒鱘鱐鱊鱍鱋鱕鱙鱌鱎鷻鷷鷯鷣鷫鷸鷤鷶鷡鷮鷦鷲鷰鷢鷬鷴鷳鷨鷭黂黐黲黳鼆鼜鼸鼷鼶齃齏"], +["f8a1","齱齰齮齯囓囍孎屭攭曭曮欓灟灡灝灠爣瓛瓥矕礸禷禶籪纗羉艭虃蠸蠷蠵衋讔讕躞躟躠躝醾醽釂鑫鑨鑩雥靆靃靇韇韥驞髕魙鱣鱧鱦鱢鱞鱠鸂鷾鸇鸃鸆鸅鸀鸁鸉鷿鷽鸄麠鼞齆齴齵齶囔攮斸欘欙欗欚灢爦犪矘矙礹籩籫糶纚"], +["f940","纘纛纙臠臡虆虇虈襹襺襼襻觿讘讙躥躤躣鑮鑭鑯鑱鑳靉顲饟鱨鱮鱭鸋鸍鸐鸏鸒鸑麡黵鼉齇齸齻齺齹圞灦籯蠼趲躦釃鑴鑸鑶鑵驠鱴鱳鱱鱵鸔鸓黶鼊"], +["f9a1","龤灨灥糷虪蠾蠽蠿讞貜躩軉靋顳顴飌饡馫驤驦驧鬤鸕鸗齈戇欞爧虌躨钂钀钁驩驨鬮鸙爩虋讟钃鱹麷癵驫鱺鸝灩灪麤齾齉龘碁銹裏墻恒粧嫺╔╦╗╠╬╣╚╩╝╒╤╕╞╪╡╘╧╛╓╥╖╟╫╢╙╨╜║═╭╮╰╯▓"] +] diff --git a/nodejs/node_modules/iconv-lite/encodings/tables/eucjp.json b/nodejs/node_modules/iconv-lite/encodings/tables/eucjp.json new file mode 100644 index 000000000..4fa61ca11 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/tables/eucjp.json @@ -0,0 +1,182 @@ +[ +["0","\u0000",127], +["8ea1","｡",62], +["a1a1","　、。，．・：；？！゛゜´｀¨＾￣＿ヽヾゝゞ〃仝々〆〇ー―‐／＼～∥｜…‥‘’“”（）〔〕［］｛｝〈",9,"＋－±×÷＝≠＜＞≦≧∞∴♂♀°′″℃￥＄￠￡％＃＆＊＠§☆★○●◎◇"], +["a2a1","◆□■△▲▽▼※〒→←↑↓〓"], +["a2ba","∈∋⊆⊇⊂⊃∪∩"], +["a2ca","∧∨￢⇒⇔∀∃"], +["a2dc","∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬"], +["a2f2","ʼn♯♭♪†‡¶"], +["a2fe","◯"], +["a3b0","０",9], +["a3c1","Ａ",25], +["a3e1","ａ",25], +["a4a1","ぁ",82], +["a5a1","ァ",85], +["a6a1","Α",16,"Σ",6], +["a6c1","α",16,"σ",6], +["a7a1","А",5,"ЁЖ",25], +["a7d1","а",5,"ёж",25], +["a8a1","─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂"], +["ada1","①",19,"Ⅰ",9], +["adc0","㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻㎜㎝㎞㎎㎏㏄㎡"], +["addf","㍻〝〟№㏍℡㊤",4,"㈱㈲㈹㍾㍽㍼≒≡∫∮∑√⊥∠∟⊿∵∩∪"], +["b0a1","亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸稲茨芋鰯允印咽員因姻引飲淫胤蔭"], +["b1a1","院陰隠韻吋右宇烏羽迂雨卯鵜窺丑碓臼渦嘘唄欝蔚鰻姥厩浦瓜閏噂云運雲荏餌叡営嬰影映曳栄永泳洩瑛盈穎頴英衛詠鋭液疫益駅悦謁越閲榎厭円園堰奄宴延怨掩援沿演炎焔煙燕猿縁艶苑薗遠鉛鴛塩於汚甥凹央奥往応"], +["b2a1","押旺横欧殴王翁襖鴬鴎黄岡沖荻億屋憶臆桶牡乙俺卸恩温穏音下化仮何伽価佳加可嘉夏嫁家寡科暇果架歌河火珂禍禾稼箇花苛茄荷華菓蝦課嘩貨迦過霞蚊俄峨我牙画臥芽蛾賀雅餓駕介会解回塊壊廻快怪悔恢懐戒拐改"], +["b3a1","魁晦械海灰界皆絵芥蟹開階貝凱劾外咳害崖慨概涯碍蓋街該鎧骸浬馨蛙垣柿蛎鈎劃嚇各廓拡撹格核殻獲確穫覚角赫較郭閣隔革学岳楽額顎掛笠樫橿梶鰍潟割喝恰括活渇滑葛褐轄且鰹叶椛樺鞄株兜竃蒲釜鎌噛鴨栢茅萱"], +["b4a1","粥刈苅瓦乾侃冠寒刊勘勧巻喚堪姦完官寛干幹患感慣憾換敢柑桓棺款歓汗漢澗潅環甘監看竿管簡緩缶翰肝艦莞観諌貫還鑑間閑関陥韓館舘丸含岸巌玩癌眼岩翫贋雁頑顔願企伎危喜器基奇嬉寄岐希幾忌揮机旗既期棋棄"], +["b5a1","機帰毅気汽畿祈季稀紀徽規記貴起軌輝飢騎鬼亀偽儀妓宜戯技擬欺犠疑祇義蟻誼議掬菊鞠吉吃喫桔橘詰砧杵黍却客脚虐逆丘久仇休及吸宮弓急救朽求汲泣灸球究窮笈級糾給旧牛去居巨拒拠挙渠虚許距鋸漁禦魚亨享京"], +["b6a1","供侠僑兇競共凶協匡卿叫喬境峡強彊怯恐恭挟教橋況狂狭矯胸脅興蕎郷鏡響饗驚仰凝尭暁業局曲極玉桐粁僅勤均巾錦斤欣欽琴禁禽筋緊芹菌衿襟謹近金吟銀九倶句区狗玖矩苦躯駆駈駒具愚虞喰空偶寓遇隅串櫛釧屑屈"], +["b7a1","掘窟沓靴轡窪熊隈粂栗繰桑鍬勲君薫訓群軍郡卦袈祁係傾刑兄啓圭珪型契形径恵慶慧憩掲携敬景桂渓畦稽系経継繋罫茎荊蛍計詣警軽頚鶏芸迎鯨劇戟撃激隙桁傑欠決潔穴結血訣月件倹倦健兼券剣喧圏堅嫌建憲懸拳捲"], +["b8a1","検権牽犬献研硯絹県肩見謙賢軒遣鍵険顕験鹸元原厳幻弦減源玄現絃舷言諺限乎個古呼固姑孤己庫弧戸故枯湖狐糊袴股胡菰虎誇跨鈷雇顧鼓五互伍午呉吾娯後御悟梧檎瑚碁語誤護醐乞鯉交佼侯候倖光公功効勾厚口向"], +["b9a1","后喉坑垢好孔孝宏工巧巷幸広庚康弘恒慌抗拘控攻昂晃更杭校梗構江洪浩港溝甲皇硬稿糠紅紘絞綱耕考肯肱腔膏航荒行衡講貢購郊酵鉱砿鋼閤降項香高鴻剛劫号合壕拷濠豪轟麹克刻告国穀酷鵠黒獄漉腰甑忽惚骨狛込"], +["baa1","此頃今困坤墾婚恨懇昏昆根梱混痕紺艮魂些佐叉唆嵯左差査沙瑳砂詐鎖裟坐座挫債催再最哉塞妻宰彩才採栽歳済災采犀砕砦祭斎細菜裁載際剤在材罪財冴坂阪堺榊肴咲崎埼碕鷺作削咋搾昨朔柵窄策索錯桜鮭笹匙冊刷"], +["bba1","察拶撮擦札殺薩雑皐鯖捌錆鮫皿晒三傘参山惨撒散桟燦珊産算纂蚕讃賛酸餐斬暫残仕仔伺使刺司史嗣四士始姉姿子屍市師志思指支孜斯施旨枝止死氏獅祉私糸紙紫肢脂至視詞詩試誌諮資賜雌飼歯事似侍児字寺慈持時"], +["bca1","次滋治爾璽痔磁示而耳自蒔辞汐鹿式識鴫竺軸宍雫七叱執失嫉室悉湿漆疾質実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮社紗者謝車遮蛇邪借勺尺杓灼爵酌釈錫若寂弱惹主取守手朱殊狩珠種腫趣酒首儒受呪寿授樹綬需囚収周"], +["bda1","宗就州修愁拾洲秀秋終繍習臭舟蒐衆襲讐蹴輯週酋酬集醜什住充十従戎柔汁渋獣縦重銃叔夙宿淑祝縮粛塾熟出術述俊峻春瞬竣舜駿准循旬楯殉淳準潤盾純巡遵醇順処初所暑曙渚庶緒署書薯藷諸助叙女序徐恕鋤除傷償"], +["bea1","勝匠升召哨商唱嘗奨妾娼宵将小少尚庄床廠彰承抄招掌捷昇昌昭晶松梢樟樵沼消渉湘焼焦照症省硝礁祥称章笑粧紹肖菖蒋蕉衝裳訟証詔詳象賞醤鉦鍾鐘障鞘上丈丞乗冗剰城場壌嬢常情擾条杖浄状畳穣蒸譲醸錠嘱埴飾"], +["bfa1","拭植殖燭織職色触食蝕辱尻伸信侵唇娠寝審心慎振新晋森榛浸深申疹真神秦紳臣芯薪親診身辛進針震人仁刃塵壬尋甚尽腎訊迅陣靭笥諏須酢図厨逗吹垂帥推水炊睡粋翠衰遂酔錐錘随瑞髄崇嵩数枢趨雛据杉椙菅頗雀裾"], +["c0a1","澄摺寸世瀬畝是凄制勢姓征性成政整星晴棲栖正清牲生盛精聖声製西誠誓請逝醒青静斉税脆隻席惜戚斥昔析石積籍績脊責赤跡蹟碩切拙接摂折設窃節説雪絶舌蝉仙先千占宣専尖川戦扇撰栓栴泉浅洗染潜煎煽旋穿箭線"], +["c1a1","繊羨腺舛船薦詮賎践選遷銭銑閃鮮前善漸然全禅繕膳糎噌塑岨措曾曽楚狙疏疎礎祖租粗素組蘇訴阻遡鼠僧創双叢倉喪壮奏爽宋層匝惣想捜掃挿掻操早曹巣槍槽漕燥争痩相窓糟総綜聡草荘葬蒼藻装走送遭鎗霜騒像増憎"], +["c2a1","臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多太汰詑唾堕妥惰打柁舵楕陀駄騨体堆対耐岱帯待怠態戴替泰滞胎腿苔袋貸退逮隊黛鯛代台大第醍題鷹滝瀧卓啄宅托択拓沢濯琢託鐸濁諾茸凧蛸只"], +["c3a1","叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽胆蛋誕鍛団壇弾断暖檀段男談値知地弛恥智池痴稚置致蜘遅馳築畜竹筑蓄逐秩窒茶嫡着中仲宙忠抽昼柱注虫衷註酎鋳駐樗瀦猪苧著貯丁兆凋喋寵"], +["c4a1","帖帳庁弔張彫徴懲挑暢朝潮牒町眺聴脹腸蝶調諜超跳銚長頂鳥勅捗直朕沈珍賃鎮陳津墜椎槌追鎚痛通塚栂掴槻佃漬柘辻蔦綴鍔椿潰坪壷嬬紬爪吊釣鶴亭低停偵剃貞呈堤定帝底庭廷弟悌抵挺提梯汀碇禎程締艇訂諦蹄逓"], +["c5a1","邸鄭釘鼎泥摘擢敵滴的笛適鏑溺哲徹撤轍迭鉄典填天展店添纏甜貼転顛点伝殿澱田電兎吐堵塗妬屠徒斗杜渡登菟賭途都鍍砥砺努度土奴怒倒党冬凍刀唐塔塘套宕島嶋悼投搭東桃梼棟盗淘湯涛灯燈当痘祷等答筒糖統到"], +["c6a1","董蕩藤討謄豆踏逃透鐙陶頭騰闘働動同堂導憧撞洞瞳童胴萄道銅峠鴇匿得徳涜特督禿篤毒独読栃橡凸突椴届鳶苫寅酉瀞噸屯惇敦沌豚遁頓呑曇鈍奈那内乍凪薙謎灘捺鍋楢馴縄畷南楠軟難汝二尼弐迩匂賑肉虹廿日乳入"], +["c7a1","如尿韮任妊忍認濡禰祢寧葱猫熱年念捻撚燃粘乃廼之埜嚢悩濃納能脳膿農覗蚤巴把播覇杷波派琶破婆罵芭馬俳廃拝排敗杯盃牌背肺輩配倍培媒梅楳煤狽買売賠陪這蝿秤矧萩伯剥博拍柏泊白箔粕舶薄迫曝漠爆縛莫駁麦"], +["c8a1","函箱硲箸肇筈櫨幡肌畑畠八鉢溌発醗髪伐罰抜筏閥鳩噺塙蛤隼伴判半反叛帆搬斑板氾汎版犯班畔繁般藩販範釆煩頒飯挽晩番盤磐蕃蛮匪卑否妃庇彼悲扉批披斐比泌疲皮碑秘緋罷肥被誹費避非飛樋簸備尾微枇毘琵眉美"], +["c9a1","鼻柊稗匹疋髭彦膝菱肘弼必畢筆逼桧姫媛紐百謬俵彪標氷漂瓢票表評豹廟描病秒苗錨鋲蒜蛭鰭品彬斌浜瀕貧賓頻敏瓶不付埠夫婦富冨布府怖扶敷斧普浮父符腐膚芙譜負賦赴阜附侮撫武舞葡蕪部封楓風葺蕗伏副復幅服"], +["caa1","福腹複覆淵弗払沸仏物鮒分吻噴墳憤扮焚奮粉糞紛雰文聞丙併兵塀幣平弊柄並蔽閉陛米頁僻壁癖碧別瞥蔑箆偏変片篇編辺返遍便勉娩弁鞭保舗鋪圃捕歩甫補輔穂募墓慕戊暮母簿菩倣俸包呆報奉宝峰峯崩庖抱捧放方朋"], +["cba1","法泡烹砲縫胞芳萌蓬蜂褒訪豊邦鋒飽鳳鵬乏亡傍剖坊妨帽忘忙房暴望某棒冒紡肪膨謀貌貿鉾防吠頬北僕卜墨撲朴牧睦穆釦勃没殆堀幌奔本翻凡盆摩磨魔麻埋妹昧枚毎哩槙幕膜枕鮪柾鱒桝亦俣又抹末沫迄侭繭麿万慢満"], +["cca1","漫蔓味未魅巳箕岬密蜜湊蓑稔脈妙粍民眠務夢無牟矛霧鵡椋婿娘冥名命明盟迷銘鳴姪牝滅免棉綿緬面麺摸模茂妄孟毛猛盲網耗蒙儲木黙目杢勿餅尤戻籾貰問悶紋門匁也冶夜爺耶野弥矢厄役約薬訳躍靖柳薮鑓愉愈油癒"], +["cda1","諭輸唯佑優勇友宥幽悠憂揖有柚湧涌猶猷由祐裕誘遊邑郵雄融夕予余与誉輿預傭幼妖容庸揚揺擁曜楊様洋溶熔用窯羊耀葉蓉要謡踊遥陽養慾抑欲沃浴翌翼淀羅螺裸来莱頼雷洛絡落酪乱卵嵐欄濫藍蘭覧利吏履李梨理璃"], +["cea1","痢裏裡里離陸律率立葎掠略劉流溜琉留硫粒隆竜龍侶慮旅虜了亮僚両凌寮料梁涼猟療瞭稜糧良諒遼量陵領力緑倫厘林淋燐琳臨輪隣鱗麟瑠塁涙累類令伶例冷励嶺怜玲礼苓鈴隷零霊麗齢暦歴列劣烈裂廉恋憐漣煉簾練聯"], +["cfa1","蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑枠鷲亙亘鰐詫藁蕨椀湾碗腕"], +["d0a1","弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆偃假會偕偐偈做偖偬偸傀傚傅傴傲"], +["d1a1","僉僊傳僂僖僞僥僭僣僮價僵儉儁儂儖儕儔儚儡儺儷儼儻儿兀兒兌兔兢竸兩兪兮冀冂囘册冉冏冑冓冕冖冤冦冢冩冪冫决冱冲冰况冽凅凉凛几處凩凭凰凵凾刄刋刔刎刧刪刮刳刹剏剄剋剌剞剔剪剴剩剳剿剽劍劔劒剱劈劑辨"], +["d2a1","辧劬劭劼劵勁勍勗勞勣勦飭勠勳勵勸勹匆匈甸匍匐匏匕匚匣匯匱匳匸區卆卅丗卉卍凖卞卩卮夘卻卷厂厖厠厦厥厮厰厶參簒雙叟曼燮叮叨叭叺吁吽呀听吭吼吮吶吩吝呎咏呵咎呟呱呷呰咒呻咀呶咄咐咆哇咢咸咥咬哄哈咨"], +["d3a1","咫哂咤咾咼哘哥哦唏唔哽哮哭哺哢唹啀啣啌售啜啅啖啗唸唳啝喙喀咯喊喟啻啾喘喞單啼喃喩喇喨嗚嗅嗟嗄嗜嗤嗔嘔嗷嘖嗾嗽嘛嗹噎噐營嘴嘶嘲嘸噫噤嘯噬噪嚆嚀嚊嚠嚔嚏嚥嚮嚶嚴囂嚼囁囃囀囈囎囑囓囗囮囹圀囿圄圉"], +["d4a1","圈國圍圓團圖嗇圜圦圷圸坎圻址坏坩埀垈坡坿垉垓垠垳垤垪垰埃埆埔埒埓堊埖埣堋堙堝塲堡塢塋塰毀塒堽塹墅墹墟墫墺壞墻墸墮壅壓壑壗壙壘壥壜壤壟壯壺壹壻壼壽夂夊夐夛梦夥夬夭夲夸夾竒奕奐奎奚奘奢奠奧奬奩"], +["d5a1","奸妁妝佞侫妣妲姆姨姜妍姙姚娥娟娑娜娉娚婀婬婉娵娶婢婪媚媼媾嫋嫂媽嫣嫗嫦嫩嫖嫺嫻嬌嬋嬖嬲嫐嬪嬶嬾孃孅孀孑孕孚孛孥孩孰孳孵學斈孺宀它宦宸寃寇寉寔寐寤實寢寞寥寫寰寶寳尅將專對尓尠尢尨尸尹屁屆屎屓"], +["d6a1","屐屏孱屬屮乢屶屹岌岑岔妛岫岻岶岼岷峅岾峇峙峩峽峺峭嶌峪崋崕崗嵜崟崛崑崔崢崚崙崘嵌嵒嵎嵋嵬嵳嵶嶇嶄嶂嶢嶝嶬嶮嶽嶐嶷嶼巉巍巓巒巖巛巫已巵帋帚帙帑帛帶帷幄幃幀幎幗幔幟幢幤幇幵并幺麼广庠廁廂廈廐廏"], +["d7a1","廖廣廝廚廛廢廡廨廩廬廱廳廰廴廸廾弃弉彝彜弋弑弖弩弭弸彁彈彌彎弯彑彖彗彙彡彭彳彷徃徂彿徊很徑徇從徙徘徠徨徭徼忖忻忤忸忱忝悳忿怡恠怙怐怩怎怱怛怕怫怦怏怺恚恁恪恷恟恊恆恍恣恃恤恂恬恫恙悁悍惧悃悚"], +["d8a1","悄悛悖悗悒悧悋惡悸惠惓悴忰悽惆悵惘慍愕愆惶惷愀惴惺愃愡惻惱愍愎慇愾愨愧慊愿愼愬愴愽慂慄慳慷慘慙慚慫慴慯慥慱慟慝慓慵憙憖憇憬憔憚憊憑憫憮懌懊應懷懈懃懆憺懋罹懍懦懣懶懺懴懿懽懼懾戀戈戉戍戌戔戛"], +["d9a1","戞戡截戮戰戲戳扁扎扞扣扛扠扨扼抂抉找抒抓抖拔抃抔拗拑抻拏拿拆擔拈拜拌拊拂拇抛拉挌拮拱挧挂挈拯拵捐挾捍搜捏掖掎掀掫捶掣掏掉掟掵捫捩掾揩揀揆揣揉插揶揄搖搴搆搓搦搶攝搗搨搏摧摯摶摎攪撕撓撥撩撈撼"], +["daa1","據擒擅擇撻擘擂擱擧舉擠擡抬擣擯攬擶擴擲擺攀擽攘攜攅攤攣攫攴攵攷收攸畋效敖敕敍敘敞敝敲數斂斃變斛斟斫斷旃旆旁旄旌旒旛旙无旡旱杲昊昃旻杳昵昶昴昜晏晄晉晁晞晝晤晧晨晟晢晰暃暈暎暉暄暘暝曁暹曉暾暼"], +["dba1","曄暸曖曚曠昿曦曩曰曵曷朏朖朞朦朧霸朮朿朶杁朸朷杆杞杠杙杣杤枉杰枩杼杪枌枋枦枡枅枷柯枴柬枳柩枸柤柞柝柢柮枹柎柆柧檜栞框栩桀桍栲桎梳栫桙档桷桿梟梏梭梔條梛梃檮梹桴梵梠梺椏梍桾椁棊椈棘椢椦棡椌棍"], +["dca1","棔棧棕椶椒椄棗棣椥棹棠棯椨椪椚椣椡棆楹楷楜楸楫楔楾楮椹楴椽楙椰楡楞楝榁楪榲榮槐榿槁槓榾槎寨槊槝榻槃榧樮榑榠榜榕榴槞槨樂樛槿權槹槲槧樅榱樞槭樔槫樊樒櫁樣樓橄樌橲樶橸橇橢橙橦橈樸樢檐檍檠檄檢檣"], +["dda1","檗蘗檻櫃櫂檸檳檬櫞櫑櫟檪櫚櫪櫻欅蘖櫺欒欖鬱欟欸欷盜欹飮歇歃歉歐歙歔歛歟歡歸歹歿殀殄殃殍殘殕殞殤殪殫殯殲殱殳殷殼毆毋毓毟毬毫毳毯麾氈氓气氛氤氣汞汕汢汪沂沍沚沁沛汾汨汳沒沐泄泱泓沽泗泅泝沮沱沾"], +["dea1","沺泛泯泙泪洟衍洶洫洽洸洙洵洳洒洌浣涓浤浚浹浙涎涕濤涅淹渕渊涵淇淦涸淆淬淞淌淨淒淅淺淙淤淕淪淮渭湮渮渙湲湟渾渣湫渫湶湍渟湃渺湎渤滿渝游溂溪溘滉溷滓溽溯滄溲滔滕溏溥滂溟潁漑灌滬滸滾漿滲漱滯漲滌"], +["dfa1","漾漓滷澆潺潸澁澀潯潛濳潭澂潼潘澎澑濂潦澳澣澡澤澹濆澪濟濕濬濔濘濱濮濛瀉瀋濺瀑瀁瀏濾瀛瀚潴瀝瀘瀟瀰瀾瀲灑灣炙炒炯烱炬炸炳炮烟烋烝烙焉烽焜焙煥煕熈煦煢煌煖煬熏燻熄熕熨熬燗熹熾燒燉燔燎燠燬燧燵燼"], +["e0a1","燹燿爍爐爛爨爭爬爰爲爻爼爿牀牆牋牘牴牾犂犁犇犒犖犢犧犹犲狃狆狄狎狒狢狠狡狹狷倏猗猊猜猖猝猴猯猩猥猾獎獏默獗獪獨獰獸獵獻獺珈玳珎玻珀珥珮珞璢琅瑯琥珸琲琺瑕琿瑟瑙瑁瑜瑩瑰瑣瑪瑶瑾璋璞璧瓊瓏瓔珱"], +["e1a1","瓠瓣瓧瓩瓮瓲瓰瓱瓸瓷甄甃甅甌甎甍甕甓甞甦甬甼畄畍畊畉畛畆畚畩畤畧畫畭畸當疆疇畴疊疉疂疔疚疝疥疣痂疳痃疵疽疸疼疱痍痊痒痙痣痞痾痿痼瘁痰痺痲痳瘋瘍瘉瘟瘧瘠瘡瘢瘤瘴瘰瘻癇癈癆癜癘癡癢癨癩癪癧癬癰"], +["e2a1","癲癶癸發皀皃皈皋皎皖皓皙皚皰皴皸皹皺盂盍盖盒盞盡盥盧盪蘯盻眈眇眄眩眤眞眥眦眛眷眸睇睚睨睫睛睥睿睾睹瞎瞋瞑瞠瞞瞰瞶瞹瞿瞼瞽瞻矇矍矗矚矜矣矮矼砌砒礦砠礪硅碎硴碆硼碚碌碣碵碪碯磑磆磋磔碾碼磅磊磬"], +["e3a1","磧磚磽磴礇礒礑礙礬礫祀祠祗祟祚祕祓祺祿禊禝禧齋禪禮禳禹禺秉秕秧秬秡秣稈稍稘稙稠稟禀稱稻稾稷穃穗穉穡穢穩龝穰穹穽窈窗窕窘窖窩竈窰窶竅竄窿邃竇竊竍竏竕竓站竚竝竡竢竦竭竰笂笏笊笆笳笘笙笞笵笨笶筐"], +["e4a1","筺笄筍笋筌筅筵筥筴筧筰筱筬筮箝箘箟箍箜箚箋箒箏筝箙篋篁篌篏箴篆篝篩簑簔篦篥籠簀簇簓篳篷簗簍篶簣簧簪簟簷簫簽籌籃籔籏籀籐籘籟籤籖籥籬籵粃粐粤粭粢粫粡粨粳粲粱粮粹粽糀糅糂糘糒糜糢鬻糯糲糴糶糺紆"], +["e5a1","紂紜紕紊絅絋紮紲紿紵絆絳絖絎絲絨絮絏絣經綉絛綏絽綛綺綮綣綵緇綽綫總綢綯緜綸綟綰緘緝緤緞緻緲緡縅縊縣縡縒縱縟縉縋縢繆繦縻縵縹繃縷縲縺繧繝繖繞繙繚繹繪繩繼繻纃緕繽辮繿纈纉續纒纐纓纔纖纎纛纜缸缺"], +["e6a1","罅罌罍罎罐网罕罔罘罟罠罨罩罧罸羂羆羃羈羇羌羔羞羝羚羣羯羲羹羮羶羸譱翅翆翊翕翔翡翦翩翳翹飜耆耄耋耒耘耙耜耡耨耿耻聊聆聒聘聚聟聢聨聳聲聰聶聹聽聿肄肆肅肛肓肚肭冐肬胛胥胙胝胄胚胖脉胯胱脛脩脣脯腋"], +["e7a1","隋腆脾腓腑胼腱腮腥腦腴膃膈膊膀膂膠膕膤膣腟膓膩膰膵膾膸膽臀臂膺臉臍臑臙臘臈臚臟臠臧臺臻臾舁舂舅與舊舍舐舖舩舫舸舳艀艙艘艝艚艟艤艢艨艪艫舮艱艷艸艾芍芒芫芟芻芬苡苣苟苒苴苳苺莓范苻苹苞茆苜茉苙"], +["e8a1","茵茴茖茲茱荀茹荐荅茯茫茗茘莅莚莪莟莢莖茣莎莇莊荼莵荳荵莠莉莨菴萓菫菎菽萃菘萋菁菷萇菠菲萍萢萠莽萸蔆菻葭萪萼蕚蒄葷葫蒭葮蒂葩葆萬葯葹萵蓊葢蒹蒿蒟蓙蓍蒻蓚蓐蓁蓆蓖蒡蔡蓿蓴蔗蔘蔬蔟蔕蔔蓼蕀蕣蕘蕈"], +["e9a1","蕁蘂蕋蕕薀薤薈薑薊薨蕭薔薛藪薇薜蕷蕾薐藉薺藏薹藐藕藝藥藜藹蘊蘓蘋藾藺蘆蘢蘚蘰蘿虍乕虔號虧虱蚓蚣蚩蚪蚋蚌蚶蚯蛄蛆蚰蛉蠣蚫蛔蛞蛩蛬蛟蛛蛯蜒蜆蜈蜀蜃蛻蜑蜉蜍蛹蜊蜴蜿蜷蜻蜥蜩蜚蝠蝟蝸蝌蝎蝴蝗蝨蝮蝙"], +["eaa1","蝓蝣蝪蠅螢螟螂螯蟋螽蟀蟐雖螫蟄螳蟇蟆螻蟯蟲蟠蠏蠍蟾蟶蟷蠎蟒蠑蠖蠕蠢蠡蠱蠶蠹蠧蠻衄衂衒衙衞衢衫袁衾袞衵衽袵衲袂袗袒袮袙袢袍袤袰袿袱裃裄裔裘裙裝裹褂裼裴裨裲褄褌褊褓襃褞褥褪褫襁襄褻褶褸襌褝襠襞"], +["eba1","襦襤襭襪襯襴襷襾覃覈覊覓覘覡覩覦覬覯覲覺覽覿觀觚觜觝觧觴觸訃訖訐訌訛訝訥訶詁詛詒詆詈詼詭詬詢誅誂誄誨誡誑誥誦誚誣諄諍諂諚諫諳諧諤諱謔諠諢諷諞諛謌謇謚諡謖謐謗謠謳鞫謦謫謾謨譁譌譏譎證譖譛譚譫"], +["eca1","譟譬譯譴譽讀讌讎讒讓讖讙讚谺豁谿豈豌豎豐豕豢豬豸豺貂貉貅貊貍貎貔豼貘戝貭貪貽貲貳貮貶賈賁賤賣賚賽賺賻贄贅贊贇贏贍贐齎贓賍贔贖赧赭赱赳趁趙跂趾趺跏跚跖跌跛跋跪跫跟跣跼踈踉跿踝踞踐踟蹂踵踰踴蹊"], +["eda1","蹇蹉蹌蹐蹈蹙蹤蹠踪蹣蹕蹶蹲蹼躁躇躅躄躋躊躓躑躔躙躪躡躬躰軆躱躾軅軈軋軛軣軼軻軫軾輊輅輕輒輙輓輜輟輛輌輦輳輻輹轅轂輾轌轉轆轎轗轜轢轣轤辜辟辣辭辯辷迚迥迢迪迯邇迴逅迹迺逑逕逡逍逞逖逋逧逶逵逹迸"], +["eea1","遏遐遑遒逎遉逾遖遘遞遨遯遶隨遲邂遽邁邀邊邉邏邨邯邱邵郢郤扈郛鄂鄒鄙鄲鄰酊酖酘酣酥酩酳酲醋醉醂醢醫醯醪醵醴醺釀釁釉釋釐釖釟釡釛釼釵釶鈞釿鈔鈬鈕鈑鉞鉗鉅鉉鉤鉈銕鈿鉋鉐銜銖銓銛鉚鋏銹銷鋩錏鋺鍄錮"], +["efa1","錙錢錚錣錺錵錻鍜鍠鍼鍮鍖鎰鎬鎭鎔鎹鏖鏗鏨鏥鏘鏃鏝鏐鏈鏤鐚鐔鐓鐃鐇鐐鐶鐫鐵鐡鐺鑁鑒鑄鑛鑠鑢鑞鑪鈩鑰鑵鑷鑽鑚鑼鑾钁鑿閂閇閊閔閖閘閙閠閨閧閭閼閻閹閾闊濶闃闍闌闕闔闖關闡闥闢阡阨阮阯陂陌陏陋陷陜陞"], +["f0a1","陝陟陦陲陬隍隘隕隗險隧隱隲隰隴隶隸隹雎雋雉雍襍雜霍雕雹霄霆霈霓霎霑霏霖霙霤霪霰霹霽霾靄靆靈靂靉靜靠靤靦靨勒靫靱靹鞅靼鞁靺鞆鞋鞏鞐鞜鞨鞦鞣鞳鞴韃韆韈韋韜韭齏韲竟韶韵頏頌頸頤頡頷頽顆顏顋顫顯顰"], +["f1a1","顱顴顳颪颯颱颶飄飃飆飩飫餃餉餒餔餘餡餝餞餤餠餬餮餽餾饂饉饅饐饋饑饒饌饕馗馘馥馭馮馼駟駛駝駘駑駭駮駱駲駻駸騁騏騅駢騙騫騷驅驂驀驃騾驕驍驛驗驟驢驥驤驩驫驪骭骰骼髀髏髑髓體髞髟髢髣髦髯髫髮髴髱髷"], +["f2a1","髻鬆鬘鬚鬟鬢鬣鬥鬧鬨鬩鬪鬮鬯鬲魄魃魏魍魎魑魘魴鮓鮃鮑鮖鮗鮟鮠鮨鮴鯀鯊鮹鯆鯏鯑鯒鯣鯢鯤鯔鯡鰺鯲鯱鯰鰕鰔鰉鰓鰌鰆鰈鰒鰊鰄鰮鰛鰥鰤鰡鰰鱇鰲鱆鰾鱚鱠鱧鱶鱸鳧鳬鳰鴉鴈鳫鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈"], +["f3a1","鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝黠黥黨黯黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠"], +["f4a1","堯槇遙瑤凜熙"], +["f9a1","纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德"], +["faa1","忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱"], +["fba1","犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚"], +["fca1","釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"], +["fcf1","ⅰ",9,"￢￤＇＂"], +["8fa2af","˘ˇ¸˙˝¯˛˚～΄΅"], +["8fa2c2","¡¦¿"], +["8fa2eb","ºª©®™¤№"], +["8fa6e1","ΆΈΉΊΪ"], +["8fa6e7","Ό"], +["8fa6e9","ΎΫ"], +["8fa6ec","Ώ"], +["8fa6f1","άέήίϊΐόςύϋΰώ"], +["8fa7c2","Ђ",10,"ЎЏ"], +["8fa7f2","ђ",10,"ўџ"], +["8fa9a1","ÆĐ"], +["8fa9a4","Ħ"], +["8fa9a6","IJ"], +["8fa9a8","ŁĿ"], +["8fa9ab","ŊØŒ"], +["8fa9af","ŦÞ"], +["8fa9c1","æđðħıijĸłŀʼnŋøœßŧþ"], +["8faaa1","ÁÀÄÂĂǍĀĄÅÃĆĈČÇĊĎÉÈËÊĚĖĒĘ"], +["8faaba","ĜĞĢĠĤÍÌÏÎǏİĪĮĨĴĶĹĽĻŃŇŅÑÓÒÖÔǑŐŌÕŔŘŖŚŜŠŞŤŢÚÙÜÛŬǓŰŪŲŮŨǗǛǙǕŴÝŸŶŹŽŻ"], +["8faba1","áàäâăǎāąåãćĉčçċďéèëêěėēęǵĝğ"], +["8fabbd","ġĥíìïîǐ"], +["8fabc5","īįĩĵķĺľļńňņñóòöôǒőōõŕřŗśŝšşťţúùüûŭǔűūųůũǘǜǚǖŵýÿŷźžż"], +["8fb0a1","丂丄丅丌丒丟丣两丨丫丮丯丰丵乀乁乄乇乑乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘佟佣佪佬佮佱佷佸佹佺佽佾侁侂侄"], +["8fb1a1","侅侉侊侌侎侐侒侓侔侗侙侚侞侟侲侷侹侻侼侽侾俀俁俅俆俈俉俋俌俍俏俒俜俠俢俰俲俼俽俿倀倁倄倇倊倌倎倐倓倗倘倛倜倝倞倢倧倮倰倲倳倵偀偁偂偅偆偊偌偎偑偒偓偗偙偟偠偢偣偦偧偪偭偰偱倻傁傃傄傆傊傎傏傐"], +["8fb2a1","傒傓傔傖傛傜傞",4,"傪傯傰傹傺傽僀僃僄僇僌僎僐僓僔僘僜僝僟僢僤僦僨僩僯僱僶僺僾儃儆儇儈儋儌儍儎僲儐儗儙儛儜儝儞儣儧儨儬儭儯儱儳儴儵儸儹兂兊兏兓兕兗兘兟兤兦兾冃冄冋冎冘冝冡冣冭冸冺冼冾冿凂"], +["8fb3a1","凈减凑凒凓凕凘凞凢凥凮凲凳凴凷刁刂刅划刓刕刖刘刢刨刱刲刵刼剅剉剕剗剘剚剜剟剠剡剦剮剷剸剹劀劂劅劊劌劓劕劖劗劘劚劜劤劥劦劧劯劰劶劷劸劺劻劽勀勄勆勈勌勏勑勔勖勛勜勡勥勨勩勪勬勰勱勴勶勷匀匃匊匋"], +["8fb4a1","匌匑匓匘匛匜匞匟匥匧匨匩匫匬匭匰匲匵匼匽匾卂卌卋卙卛卡卣卥卬卭卲卹卾厃厇厈厎厓厔厙厝厡厤厪厫厯厲厴厵厷厸厺厽叀叅叏叒叓叕叚叝叞叠另叧叵吂吓吚吡吧吨吪启吱吴吵呃呄呇呍呏呞呢呤呦呧呩呫呭呮呴呿"], +["8fb5a1","咁咃咅咈咉咍咑咕咖咜咟咡咦咧咩咪咭咮咱咷咹咺咻咿哆哊响哎哠哪哬哯哶哼哾哿唀唁唅唈唉唌唍唎唕唪唫唲唵唶唻唼唽啁啇啉啊啍啐啑啘啚啛啞啠啡啤啦啿喁喂喆喈喎喏喑喒喓喔喗喣喤喭喲喿嗁嗃嗆嗉嗋嗌嗎嗑嗒"], +["8fb6a1","嗓嗗嗘嗛嗞嗢嗩嗶嗿嘅嘈嘊嘍",5,"嘙嘬嘰嘳嘵嘷嘹嘻嘼嘽嘿噀噁噃噄噆噉噋噍噏噔噞噠噡噢噣噦噩噭噯噱噲噵嚄嚅嚈嚋嚌嚕嚙嚚嚝嚞嚟嚦嚧嚨嚩嚫嚬嚭嚱嚳嚷嚾囅囉囊囋囏囐囌囍囙囜囝囟囡囤",4,"囱囫园"], +["8fb7a1","囶囷圁圂圇圊圌圑圕圚圛圝圠圢圣圤圥圩圪圬圮圯圳圴圽圾圿坅坆坌坍坒坢坥坧坨坫坭",4,"坳坴坵坷坹坺坻坼坾垁垃垌垔垗垙垚垜垝垞垟垡垕垧垨垩垬垸垽埇埈埌埏埕埝埞埤埦埧埩埭埰埵埶埸埽埾埿堃堄堈堉埡"], +["8fb8a1","堌堍堛堞堟堠堦堧堭堲堹堿塉塌塍塏塐塕塟塡塤塧塨塸塼塿墀墁墇墈墉墊墌墍墏墐墔墖墝墠墡墢墦墩墱墲壄墼壂壈壍壎壐壒壔壖壚壝壡壢壩壳夅夆夋夌夒夓夔虁夝夡夣夤夨夯夰夳夵夶夿奃奆奒奓奙奛奝奞奟奡奣奫奭"], +["8fb9a1","奯奲奵奶她奻奼妋妌妎妒妕妗妟妤妧妭妮妯妰妳妷妺妼姁姃姄姈姊姍姒姝姞姟姣姤姧姮姯姱姲姴姷娀娄娌娍娎娒娓娞娣娤娧娨娪娭娰婄婅婇婈婌婐婕婞婣婥婧婭婷婺婻婾媋媐媓媖媙媜媞媟媠媢媧媬媱媲媳媵媸媺媻媿"], +["8fbaa1","嫄嫆嫈嫏嫚嫜嫠嫥嫪嫮嫵嫶嫽嬀嬁嬈嬗嬴嬙嬛嬝嬡嬥嬭嬸孁孋孌孒孖孞孨孮孯孼孽孾孿宁宄宆宊宎宐宑宓宔宖宨宩宬宭宯宱宲宷宺宼寀寁寍寏寖",4,"寠寯寱寴寽尌尗尞尟尣尦尩尫尬尮尰尲尵尶屙屚屜屢屣屧屨屩"], +["8fbba1","屭屰屴屵屺屻屼屽岇岈岊岏岒岝岟岠岢岣岦岪岲岴岵岺峉峋峒峝峗峮峱峲峴崁崆崍崒崫崣崤崦崧崱崴崹崽崿嵂嵃嵆嵈嵕嵑嵙嵊嵟嵠嵡嵢嵤嵪嵭嵰嵹嵺嵾嵿嶁嶃嶈嶊嶒嶓嶔嶕嶙嶛嶟嶠嶧嶫嶰嶴嶸嶹巃巇巋巐巎巘巙巠巤"], +["8fbca1","巩巸巹帀帇帍帒帔帕帘帟帠帮帨帲帵帾幋幐幉幑幖幘幛幜幞幨幪",4,"幰庀庋庎庢庤庥庨庪庬庱庳庽庾庿廆廌廋廎廑廒廔廕廜廞廥廫异弆弇弈弎弙弜弝弡弢弣弤弨弫弬弮弰弴弶弻弽弿彀彄彅彇彍彐彔彘彛彠彣彤彧"], +["8fbda1","彯彲彴彵彸彺彽彾徉徍徏徖徜徝徢徧徫徤徬徯徰徱徸忄忇忈忉忋忐",4,"忞忡忢忨忩忪忬忭忮忯忲忳忶忺忼怇怊怍怓怔怗怘怚怟怤怭怳怵恀恇恈恉恌恑恔恖恗恝恡恧恱恾恿悂悆悈悊悎悑悓悕悘悝悞悢悤悥您悰悱悷"], +["8fbea1","悻悾惂惄惈惉惊惋惎惏惔惕惙惛惝惞惢惥惲惵惸惼惽愂愇愊愌愐",4,"愖愗愙愜愞愢愪愫愰愱愵愶愷愹慁慅慆慉慞慠慬慲慸慻慼慿憀憁憃憄憋憍憒憓憗憘憜憝憟憠憥憨憪憭憸憹憼懀懁懂懎懏懕懜懝懞懟懡懢懧懩懥"], +["8fbfa1","懬懭懯戁戃戄戇戓戕戜戠戢戣戧戩戫戹戽扂扃扄扆扌扐扑扒扔扖扚扜扤扭扯扳扺扽抍抎抏抐抦抨抳抶抷抺抾抿拄拎拕拖拚拪拲拴拼拽挃挄挊挋挍挐挓挖挘挩挪挭挵挶挹挼捁捂捃捄捆捊捋捎捒捓捔捘捛捥捦捬捭捱捴捵"], +["8fc0a1","捸捼捽捿掂掄掇掊掐掔掕掙掚掞掤掦掭掮掯掽揁揅揈揎揑揓揔揕揜揠揥揪揬揲揳揵揸揹搉搊搐搒搔搘搞搠搢搤搥搩搪搯搰搵搽搿摋摏摑摒摓摔摚摛摜摝摟摠摡摣摭摳摴摻摽撅撇撏撐撑撘撙撛撝撟撡撣撦撨撬撳撽撾撿"], +["8fc1a1","擄擉擊擋擌擎擐擑擕擗擤擥擩擪擭擰擵擷擻擿攁攄攈攉攊攏攓攔攖攙攛攞攟攢攦攩攮攱攺攼攽敃敇敉敐敒敔敟敠敧敫敺敽斁斅斊斒斕斘斝斠斣斦斮斲斳斴斿旂旈旉旎旐旔旖旘旟旰旲旴旵旹旾旿昀昄昈昉昍昑昒昕昖昝"], +["8fc2a1","昞昡昢昣昤昦昩昪昫昬昮昰昱昳昹昷晀晅晆晊晌晑晎晗晘晙晛晜晠晡曻晪晫晬晾晳晵晿晷晸晹晻暀晼暋暌暍暐暒暙暚暛暜暟暠暤暭暱暲暵暻暿曀曂曃曈曌曎曏曔曛曟曨曫曬曮曺朅朇朎朓朙朜朠朢朳朾杅杇杈杌杔杕杝"], +["8fc3a1","杦杬杮杴杶杻极构枎枏枑枓枖枘枙枛枰枱枲枵枻枼枽柹柀柂柃柅柈柉柒柗柙柜柡柦柰柲柶柷桒栔栙栝栟栨栧栬栭栯栰栱栳栻栿桄桅桊桌桕桗桘桛桫桮",4,"桵桹桺桻桼梂梄梆梈梖梘梚梜梡梣梥梩梪梮梲梻棅棈棌棏"], +["8fc4a1","棐棑棓棖棙棜棝棥棨棪棫棬棭棰棱棵棶棻棼棽椆椉椊椐椑椓椖椗椱椳椵椸椻楂楅楉楎楗楛楣楤楥楦楨楩楬楰楱楲楺楻楿榀榍榒榖榘榡榥榦榨榫榭榯榷榸榺榼槅槈槑槖槗槢槥槮槯槱槳槵槾樀樁樃樏樑樕樚樝樠樤樨樰樲"], +["8fc5a1","樴樷樻樾樿橅橆橉橊橎橐橑橒橕橖橛橤橧橪橱橳橾檁檃檆檇檉檋檑檛檝檞檟檥檫檯檰檱檴檽檾檿櫆櫉櫈櫌櫐櫔櫕櫖櫜櫝櫤櫧櫬櫰櫱櫲櫼櫽欂欃欆欇欉欏欐欑欗欛欞欤欨欫欬欯欵欶欻欿歆歊歍歒歖歘歝歠歧歫歮歰歵歽"], +["8fc6a1","歾殂殅殗殛殟殠殢殣殨殩殬殭殮殰殸殹殽殾毃毄毉毌毖毚毡毣毦毧毮毱毷毹毿氂氄氅氉氍氎氐氒氙氟氦氧氨氬氮氳氵氶氺氻氿汊汋汍汏汒汔汙汛汜汫汭汯汴汶汸汹汻沅沆沇沉沔沕沗沘沜沟沰沲沴泂泆泍泏泐泑泒泔泖"], +["8fc7a1","泚泜泠泧泩泫泬泮泲泴洄洇洊洎洏洑洓洚洦洧洨汧洮洯洱洹洼洿浗浞浟浡浥浧浯浰浼涂涇涑涒涔涖涗涘涪涬涴涷涹涽涿淄淈淊淎淏淖淛淝淟淠淢淥淩淯淰淴淶淼渀渄渞渢渧渲渶渹渻渼湄湅湈湉湋湏湑湒湓湔湗湜湝湞"], +["8fc8a1","湢湣湨湳湻湽溍溓溙溠溧溭溮溱溳溻溿滀滁滃滇滈滊滍滎滏滫滭滮滹滻滽漄漈漊漌漍漖漘漚漛漦漩漪漯漰漳漶漻漼漭潏潑潒潓潗潙潚潝潞潡潢潨潬潽潾澃澇澈澋澌澍澐澒澓澔澖澚澟澠澥澦澧澨澮澯澰澵澶澼濅濇濈濊"], +["8fc9a1","濚濞濨濩濰濵濹濼濽瀀瀅瀆瀇瀍瀗瀠瀣瀯瀴瀷瀹瀼灃灄灈灉灊灋灔灕灝灞灎灤灥灬灮灵灶灾炁炅炆炔",4,"炛炤炫炰炱炴炷烊烑烓烔烕烖烘烜烤烺焃",4,"焋焌焏焞焠焫焭焯焰焱焸煁煅煆煇煊煋煐煒煗煚煜煞煠"], +["8fcaa1","煨煹熀熅熇熌熒熚熛熠熢熯熰熲熳熺熿燀燁燄燋燌燓燖燙燚燜燸燾爀爇爈爉爓爗爚爝爟爤爫爯爴爸爹牁牂牃牅牎牏牐牓牕牖牚牜牞牠牣牨牫牮牯牱牷牸牻牼牿犄犉犍犎犓犛犨犭犮犱犴犾狁狇狉狌狕狖狘狟狥狳狴狺狻"], +["8fcba1","狾猂猄猅猇猋猍猒猓猘猙猞猢猤猧猨猬猱猲猵猺猻猽獃獍獐獒獖獘獝獞獟獠獦獧獩獫獬獮獯獱獷獹獼玀玁玃玅玆玎玐玓玕玗玘玜玞玟玠玢玥玦玪玫玭玵玷玹玼玽玿珅珆珉珋珌珏珒珓珖珙珝珡珣珦珧珩珴珵珷珹珺珻珽"], +["8fcca1","珿琀琁琄琇琊琑琚琛琤琦琨",9,"琹瑀瑃瑄瑆瑇瑋瑍瑑瑒瑗瑝瑢瑦瑧瑨瑫瑭瑮瑱瑲璀璁璅璆璇璉璏璐璑璒璘璙璚璜璟璠璡璣璦璨璩璪璫璮璯璱璲璵璹璻璿瓈瓉瓌瓐瓓瓘瓚瓛瓞瓟瓤瓨瓪瓫瓯瓴瓺瓻瓼瓿甆"], +["8fcda1","甒甖甗甠甡甤甧甩甪甯甶甹甽甾甿畀畃畇畈畎畐畒畗畞畟畡畯畱畹",5,"疁疅疐疒疓疕疙疜疢疤疴疺疿痀痁痄痆痌痎痏痗痜痟痠痡痤痧痬痮痯痱痹瘀瘂瘃瘄瘇瘈瘊瘌瘏瘒瘓瘕瘖瘙瘛瘜瘝瘞瘣瘥瘦瘩瘭瘲瘳瘵瘸瘹"], +["8fcea1","瘺瘼癊癀癁癃癄癅癉癋癕癙癟癤癥癭癮癯癱癴皁皅皌皍皕皛皜皝皟皠皢",6,"皪皭皽盁盅盉盋盌盎盔盙盠盦盨盬盰盱盶盹盼眀眆眊眎眒眔眕眗眙眚眜眢眨眭眮眯眴眵眶眹眽眾睂睅睆睊睍睎睏睒睖睗睜睞睟睠睢"], +["8fcfa1","睤睧睪睬睰睲睳睴睺睽瞀瞄瞌瞍瞔瞕瞖瞚瞟瞢瞧瞪瞮瞯瞱瞵瞾矃矉矑矒矕矙矞矟矠矤矦矪矬矰矱矴矸矻砅砆砉砍砎砑砝砡砢砣砭砮砰砵砷硃硄硇硈硌硎硒硜硞硠硡硣硤硨硪确硺硾碊碏碔碘碡碝碞碟碤碨碬碭碰碱碲碳"], +["8fd0a1","碻碽碿磇磈磉磌磎磒磓磕磖磤磛磟磠磡磦磪磲磳礀磶磷磺磻磿礆礌礐礚礜礞礟礠礥礧礩礭礱礴礵礻礽礿祄祅祆祊祋祏祑祔祘祛祜祧祩祫祲祹祻祼祾禋禌禑禓禔禕禖禘禛禜禡禨禩禫禯禱禴禸离秂秄秇秈秊秏秔秖秚秝秞"], +["8fd1a1","秠秢秥秪秫秭秱秸秼稂稃稇稉稊稌稑稕稛稞稡稧稫稭稯稰稴稵稸稹稺穄穅穇穈穌穕穖穙穜穝穟穠穥穧穪穭穵穸穾窀窂窅窆窊窋窐窑窔窞窠窣窬窳窵窹窻窼竆竉竌竎竑竛竨竩竫竬竱竴竻竽竾笇笔笟笣笧笩笪笫笭笮笯笰"], +["8fd2a1","笱笴笽笿筀筁筇筎筕筠筤筦筩筪筭筯筲筳筷箄箉箎箐箑箖箛箞箠箥箬箯箰箲箵箶箺箻箼箽篂篅篈篊篔篖篗篙篚篛篨篪篲篴篵篸篹篺篼篾簁簂簃簄簆簉簋簌簎簏簙簛簠簥簦簨簬簱簳簴簶簹簺籆籊籕籑籒籓籙",5], +["8fd3a1","籡籣籧籩籭籮籰籲籹籼籽粆粇粏粔粞粠粦粰粶粷粺粻粼粿糄糇糈糉糍糏糓糔糕糗糙糚糝糦糩糫糵紃紇紈紉紏紑紒紓紖紝紞紣紦紪紭紱紼紽紾絀絁絇絈絍絑絓絗絙絚絜絝絥絧絪絰絸絺絻絿綁綂綃綅綆綈綋綌綍綑綖綗綝"], +["8fd4a1","綞綦綧綪綳綶綷綹緂",4,"緌緍緎緗緙縀緢緥緦緪緫緭緱緵緶緹緺縈縐縑縕縗縜縝縠縧縨縬縭縯縳縶縿繄繅繇繎繐繒繘繟繡繢繥繫繮繯繳繸繾纁纆纇纊纍纑纕纘纚纝纞缼缻缽缾缿罃罄罇罏罒罓罛罜罝罡罣罤罥罦罭"], +["8fd5a1","罱罽罾罿羀羋羍羏羐羑羖羗羜羡羢羦羪羭羴羼羿翀翃翈翎翏翛翟翣翥翨翬翮翯翲翺翽翾翿耇耈耊耍耎耏耑耓耔耖耝耞耟耠耤耦耬耮耰耴耵耷耹耺耼耾聀聄聠聤聦聭聱聵肁肈肎肜肞肦肧肫肸肹胈胍胏胒胔胕胗胘胠胭胮"], +["8fd6a1","胰胲胳胶胹胺胾脃脋脖脗脘脜脞脠脤脧脬脰脵脺脼腅腇腊腌腒腗腠腡腧腨腩腭腯腷膁膐膄膅膆膋膎膖膘膛膞膢膮膲膴膻臋臃臅臊臎臏臕臗臛臝臞臡臤臫臬臰臱臲臵臶臸臹臽臿舀舃舏舓舔舙舚舝舡舢舨舲舴舺艃艄艅艆"], +["8fd7a1","艋艎艏艑艖艜艠艣艧艭艴艻艽艿芀芁芃芄芇芉芊芎芑芔芖芘芚芛芠芡芣芤芧芨芩芪芮芰芲芴芷芺芼芾芿苆苐苕苚苠苢苤苨苪苭苯苶苷苽苾茀茁茇茈茊茋荔茛茝茞茟茡茢茬茭茮茰茳茷茺茼茽荂荃荄荇荍荎荑荕荖荗荰荸"], +["8fd8a1","荽荿莀莂莄莆莍莒莔莕莘莙莛莜莝莦莧莩莬莾莿菀菇菉菏菐菑菔菝荓菨菪菶菸菹菼萁萆萊萏萑萕萙莭萯萹葅葇葈葊葍葏葑葒葖葘葙葚葜葠葤葥葧葪葰葳葴葶葸葼葽蒁蒅蒒蒓蒕蒞蒦蒨蒩蒪蒯蒱蒴蒺蒽蒾蓀蓂蓇蓈蓌蓏蓓"], +["8fd9a1","蓜蓧蓪蓯蓰蓱蓲蓷蔲蓺蓻蓽蔂蔃蔇蔌蔎蔐蔜蔞蔢蔣蔤蔥蔧蔪蔫蔯蔳蔴蔶蔿蕆蕏",4,"蕖蕙蕜",6,"蕤蕫蕯蕹蕺蕻蕽蕿薁薅薆薉薋薌薏薓薘薝薟薠薢薥薧薴薶薷薸薼薽薾薿藂藇藊藋藎薭藘藚藟藠藦藨藭藳藶藼"], +["8fdaa1","藿蘀蘄蘅蘍蘎蘐蘑蘒蘘蘙蘛蘞蘡蘧蘩蘶蘸蘺蘼蘽虀虂虆虒虓虖虗虘虙虝虠",4,"虩虬虯虵虶虷虺蚍蚑蚖蚘蚚蚜蚡蚦蚧蚨蚭蚱蚳蚴蚵蚷蚸蚹蚿蛀蛁蛃蛅蛑蛒蛕蛗蛚蛜蛠蛣蛥蛧蚈蛺蛼蛽蜄蜅蜇蜋蜎蜏蜐蜓蜔蜙蜞蜟蜡蜣"], +["8fdba1","蜨蜮蜯蜱蜲蜹蜺蜼蜽蜾蝀蝃蝅蝍蝘蝝蝡蝤蝥蝯蝱蝲蝻螃",6,"螋螌螐螓螕螗螘螙螞螠螣螧螬螭螮螱螵螾螿蟁蟈蟉蟊蟎蟕蟖蟙蟚蟜蟟蟢蟣蟤蟪蟫蟭蟱蟳蟸蟺蟿蠁蠃蠆蠉蠊蠋蠐蠙蠒蠓蠔蠘蠚蠛蠜蠞蠟蠨蠭蠮蠰蠲蠵"], +["8fdca1","蠺蠼衁衃衅衈衉衊衋衎衑衕衖衘衚衜衟衠衤衩衱衹衻袀袘袚袛袜袟袠袨袪袺袽袾裀裊",4,"裑裒裓裛裞裧裯裰裱裵裷褁褆褍褎褏褕褖褘褙褚褜褠褦褧褨褰褱褲褵褹褺褾襀襂襅襆襉襏襒襗襚襛襜襡襢襣襫襮襰襳襵襺"], +["8fdda1","襻襼襽覉覍覐覔覕覛覜覟覠覥覰覴覵覶覷覼觔",4,"觥觩觫觭觱觳觶觹觽觿訄訅訇訏訑訒訔訕訞訠訢訤訦訫訬訯訵訷訽訾詀詃詅詇詉詍詎詓詖詗詘詜詝詡詥詧詵詶詷詹詺詻詾詿誀誃誆誋誏誐誒誖誗誙誟誧誩誮誯誳"], +["8fdea1","誶誷誻誾諃諆諈諉諊諑諓諔諕諗諝諟諬諰諴諵諶諼諿謅謆謋謑謜謞謟謊謭謰謷謼譂",4,"譈譒譓譔譙譍譞譣譭譶譸譹譼譾讁讄讅讋讍讏讔讕讜讞讟谸谹谽谾豅豇豉豋豏豑豓豔豗豘豛豝豙豣豤豦豨豩豭豳豵豶豻豾貆"], +["8fdfa1","貇貋貐貒貓貙貛貜貤貹貺賅賆賉賋賏賖賕賙賝賡賨賬賯賰賲賵賷賸賾賿贁贃贉贒贗贛赥赩赬赮赿趂趄趈趍趐趑趕趞趟趠趦趫趬趯趲趵趷趹趻跀跅跆跇跈跊跎跑跔跕跗跙跤跥跧跬跰趼跱跲跴跽踁踄踅踆踋踑踔踖踠踡踢"], +["8fe0a1","踣踦踧踱踳踶踷踸踹踽蹀蹁蹋蹍蹎蹏蹔蹛蹜蹝蹞蹡蹢蹩蹬蹭蹯蹰蹱蹹蹺蹻躂躃躉躐躒躕躚躛躝躞躢躧躩躭躮躳躵躺躻軀軁軃軄軇軏軑軔軜軨軮軰軱軷軹軺軭輀輂輇輈輏輐輖輗輘輞輠輡輣輥輧輨輬輭輮輴輵輶輷輺轀轁"], +["8fe1a1","轃轇轏轑",4,"轘轝轞轥辝辠辡辤辥辦辵辶辸达迀迁迆迊迋迍运迒迓迕迠迣迤迨迮迱迵迶迻迾适逄逈逌逘逛逨逩逯逪逬逭逳逴逷逿遃遄遌遛遝遢遦遧遬遰遴遹邅邈邋邌邎邐邕邗邘邙邛邠邡邢邥邰邲邳邴邶邽郌邾郃"], +["8fe2a1","郄郅郇郈郕郗郘郙郜郝郟郥郒郶郫郯郰郴郾郿鄀鄄鄅鄆鄈鄍鄐鄔鄖鄗鄘鄚鄜鄞鄠鄥鄢鄣鄧鄩鄮鄯鄱鄴鄶鄷鄹鄺鄼鄽酃酇酈酏酓酗酙酚酛酡酤酧酭酴酹酺酻醁醃醅醆醊醎醑醓醔醕醘醞醡醦醨醬醭醮醰醱醲醳醶醻醼醽醿"], +["8fe3a1","釂釃釅釓釔釗釙釚釞釤釥釩釪釬",5,"釷釹釻釽鈀鈁鈄鈅鈆鈇鈉鈊鈌鈐鈒鈓鈖鈘鈜鈝鈣鈤鈥鈦鈨鈮鈯鈰鈳鈵鈶鈸鈹鈺鈼鈾鉀鉂鉃鉆鉇鉊鉍鉎鉏鉑鉘鉙鉜鉝鉠鉡鉥鉧鉨鉩鉮鉯鉰鉵",4,"鉻鉼鉽鉿銈銉銊銍銎銒銗"], +["8fe4a1","銙銟銠銤銥銧銨銫銯銲銶銸銺銻銼銽銿",4,"鋅鋆鋇鋈鋋鋌鋍鋎鋐鋓鋕鋗鋘鋙鋜鋝鋟鋠鋡鋣鋥鋧鋨鋬鋮鋰鋹鋻鋿錀錂錈錍錑錔錕錜錝錞錟錡錤錥錧錩錪錳錴錶錷鍇鍈鍉鍐鍑鍒鍕鍗鍘鍚鍞鍤鍥鍧鍩鍪鍭鍯鍰鍱鍳鍴鍶"], +["8fe5a1","鍺鍽鍿鎀鎁鎂鎈鎊鎋鎍鎏鎒鎕鎘鎛鎞鎡鎣鎤鎦鎨鎫鎴鎵鎶鎺鎩鏁鏄鏅鏆鏇鏉",4,"鏓鏙鏜鏞鏟鏢鏦鏧鏹鏷鏸鏺鏻鏽鐁鐂鐄鐈鐉鐍鐎鐏鐕鐖鐗鐟鐮鐯鐱鐲鐳鐴鐻鐿鐽鑃鑅鑈鑊鑌鑕鑙鑜鑟鑡鑣鑨鑫鑭鑮鑯鑱鑲钄钃镸镹"], +["8fe6a1","镾閄閈閌閍閎閝閞閟閡閦閩閫閬閴閶閺閽閿闆闈闉闋闐闑闒闓闙闚闝闞闟闠闤闦阝阞阢阤阥阦阬阱阳阷阸阹阺阼阽陁陒陔陖陗陘陡陮陴陻陼陾陿隁隂隃隄隉隑隖隚隝隟隤隥隦隩隮隯隳隺雊雒嶲雘雚雝雞雟雩雯雱雺霂"], +["8fe7a1","霃霅霉霚霛霝霡霢霣霨霱霳靁靃靊靎靏靕靗靘靚靛靣靧靪靮靳靶靷靸靻靽靿鞀鞉鞕鞖鞗鞙鞚鞞鞟鞢鞬鞮鞱鞲鞵鞶鞸鞹鞺鞼鞾鞿韁韄韅韇韉韊韌韍韎韐韑韔韗韘韙韝韞韠韛韡韤韯韱韴韷韸韺頇頊頙頍頎頔頖頜頞頠頣頦"], +["8fe8a1","頫頮頯頰頲頳頵頥頾顄顇顊顑顒顓顖顗顙顚顢顣顥顦顪顬颫颭颮颰颴颷颸颺颻颿飂飅飈飌飡飣飥飦飧飪飳飶餂餇餈餑餕餖餗餚餛餜餟餢餦餧餫餱",4,"餹餺餻餼饀饁饆饇饈饍饎饔饘饙饛饜饞饟饠馛馝馟馦馰馱馲馵"], +["8fe9a1","馹馺馽馿駃駉駓駔駙駚駜駞駧駪駫駬駰駴駵駹駽駾騂騃騄騋騌騐騑騖騞騠騢騣騤騧騭騮騳騵騶騸驇驁驄驊驋驌驎驑驔驖驝骪骬骮骯骲骴骵骶骹骻骾骿髁髃髆髈髎髐髒髕髖髗髛髜髠髤髥髧髩髬髲髳髵髹髺髽髿",4], +["8feaa1","鬄鬅鬈鬉鬋鬌鬍鬎鬐鬒鬖鬙鬛鬜鬠鬦鬫鬭鬳鬴鬵鬷鬹鬺鬽魈魋魌魕魖魗魛魞魡魣魥魦魨魪",4,"魳魵魷魸魹魿鮀鮄鮅鮆鮇鮉鮊鮋鮍鮏鮐鮔鮚鮝鮞鮦鮧鮩鮬鮰鮱鮲鮷鮸鮻鮼鮾鮿鯁鯇鯈鯎鯐鯗鯘鯝鯟鯥鯧鯪鯫鯯鯳鯷鯸"], +["8feba1","鯹鯺鯽鯿鰀鰂鰋鰏鰑鰖鰘鰙鰚鰜鰞鰢鰣鰦",4,"鰱鰵鰶鰷鰽鱁鱃鱄鱅鱉鱊鱎鱏鱐鱓鱔鱖鱘鱛鱝鱞鱟鱣鱩鱪鱜鱫鱨鱮鱰鱲鱵鱷鱻鳦鳲鳷鳹鴋鴂鴑鴗鴘鴜鴝鴞鴯鴰鴲鴳鴴鴺鴼鵅鴽鵂鵃鵇鵊鵓鵔鵟鵣鵢鵥鵩鵪鵫鵰鵶鵷鵻"], +["8feca1","鵼鵾鶃鶄鶆鶊鶍鶎鶒鶓鶕鶖鶗鶘鶡鶪鶬鶮鶱鶵鶹鶼鶿鷃鷇鷉鷊鷔鷕鷖鷗鷚鷞鷟鷠鷥鷧鷩鷫鷮鷰鷳鷴鷾鸊鸂鸇鸎鸐鸑鸒鸕鸖鸙鸜鸝鹺鹻鹼麀麂麃麄麅麇麎麏麖麘麛麞麤麨麬麮麯麰麳麴麵黆黈黋黕黟黤黧黬黭黮黰黱黲黵"], +["8feda1","黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃",4,"齓齕齖齗齘齚齝齞齨齩齭",4,"齳齵齺齽龏龐龑龒龔龖龗龞龡龢龣龥"] +] diff --git a/nodejs/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json b/nodejs/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json new file mode 100644 index 000000000..85c693475 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json @@ -0,0 +1 @@ +{"uChars":[128,165,169,178,184,216,226,235,238,244,248,251,253,258,276,284,300,325,329,334,364,463,465,467,469,471,473,475,477,506,594,610,712,716,730,930,938,962,970,1026,1104,1106,8209,8215,8218,8222,8231,8241,8244,8246,8252,8365,8452,8454,8458,8471,8482,8556,8570,8596,8602,8713,8720,8722,8726,8731,8737,8740,8742,8748,8751,8760,8766,8777,8781,8787,8802,8808,8816,8854,8858,8870,8896,8979,9322,9372,9548,9588,9616,9622,9634,9652,9662,9672,9676,9680,9702,9735,9738,9793,9795,11906,11909,11913,11917,11928,11944,11947,11951,11956,11960,11964,11979,12284,12292,12312,12319,12330,12351,12436,12447,12535,12543,12586,12842,12850,12964,13200,13215,13218,13253,13263,13267,13270,13384,13428,13727,13839,13851,14617,14703,14801,14816,14964,15183,15471,15585,16471,16736,17208,17325,17330,17374,17623,17997,18018,18212,18218,18301,18318,18760,18811,18814,18820,18823,18844,18848,18872,19576,19620,19738,19887,40870,59244,59336,59367,59413,59417,59423,59431,59437,59443,59452,59460,59478,59493,63789,63866,63894,63976,63986,64016,64018,64021,64025,64034,64037,64042,65074,65093,65107,65112,65127,65132,65375,65510,65536],"gbChars":[0,36,38,45,50,81,89,95,96,100,103,104,105,109,126,133,148,172,175,179,208,306,307,308,309,310,311,312,313,341,428,443,544,545,558,741,742,749,750,805,819,820,7922,7924,7925,7927,7934,7943,7944,7945,7950,8062,8148,8149,8152,8164,8174,8236,8240,8262,8264,8374,8380,8381,8384,8388,8390,8392,8393,8394,8396,8401,8406,8416,8419,8424,8437,8439,8445,8482,8485,8496,8521,8603,8936,8946,9046,9050,9063,9066,9076,9092,9100,9108,9111,9113,9131,9162,9164,9218,9219,11329,11331,11334,11336,11346,11361,11363,11366,11370,11372,11375,11389,11682,11686,11687,11692,11694,11714,11716,11723,11725,11730,11736,11982,11989,12102,12336,12348,12350,12384,12393,12395,12397,12510,12553,12851,12962,12973,13738,13823,13919,13933,14080,14298,14585,14698,15583,15847,16318,16434,16438,16481,16729,17102,17122,17315,17320,17402,17418,17859,17909,17911,17915,17916,17936,17939,17961,18664,18703,18814,18962,19043,33469,33470,33471,33484,33485,33490,33497,33501,33505,33513,33520,33536,33550,37845,37921,37948,38029,38038,38064,38065,38066,38069,38075,38076,38078,39108,39109,39113,39114,39115,39116,39265,39394,189000]} \ No newline at end of file diff --git a/nodejs/node_modules/iconv-lite/encodings/tables/gbk-added.json b/nodejs/node_modules/iconv-lite/encodings/tables/gbk-added.json new file mode 100644 index 000000000..8abfa9f7b --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/tables/gbk-added.json @@ -0,0 +1,55 @@ +[ +["a140","",62], +["a180","",32], +["a240","",62], +["a280","",32], +["a2ab","",5], +["a2e3","€"], +["a2ef",""], +["a2fd",""], +["a340","",62], +["a380","",31,"　"], +["a440","",62], +["a480","",32], +["a4f4","",10], +["a540","",62], +["a580","",32], +["a5f7","",7], +["a640","",62], +["a680","",32], +["a6b9","",7], +["a6d9","",6], +["a6ec",""], +["a6f3",""], +["a6f6","",8], +["a740","",62], +["a780","",32], +["a7c2","",14], +["a7f2","",12], +["a896","",10], +["a8bc",""], +["a8bf","ǹ"], +["a8c1",""], +["a8ea","",20], +["a958",""], +["a95b",""], +["a95d",""], +["a989","〾⿰",11], +["a997","",12], +["a9f0","",14], +["aaa1","",93], +["aba1","",93], +["aca1","",93], +["ada1","",93], +["aea1","",93], +["afa1","",93], +["d7fa","",4], +["f8a1","",93], +["f9a1","",93], +["faa1","",93], +["fba1","",93], +["fca1","",93], +["fda1","",93], +["fe50","⺁⺄㑳㑇⺈⺋㖞㘚㘎⺌⺗㥮㤘㧏㧟㩳㧐㭎㱮㳠⺧⺪䁖䅟⺮䌷⺳⺶⺷䎱䎬⺻䏝䓖䙡䙌"], +["fe80","䜣䜩䝼䞍⻊䥇䥺䥽䦂䦃䦅䦆䦟䦛䦷䦶䲣䲟䲠䲡䱷䲢䴓",6,"䶮",93] +] diff --git a/nodejs/node_modules/iconv-lite/encodings/tables/shiftjis.json b/nodejs/node_modules/iconv-lite/encodings/tables/shiftjis.json new file mode 100644 index 000000000..5a3a43cf8 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/tables/shiftjis.json @@ -0,0 +1,125 @@ +[ +["0","\u0000",128], +["a1","｡",62], +["8140","　、。，．・：；？！゛゜´｀¨＾￣＿ヽヾゝゞ〃仝々〆〇ー―‐／＼～∥｜…‥‘’“”（）〔〕［］｛｝〈",9,"＋－±×"], +["8180","÷＝≠＜＞≦≧∞∴♂♀°′″℃￥＄￠￡％＃＆＊＠§☆★○●◎◇◆□■△▲▽▼※〒→←↑↓〓"], +["81b8","∈∋⊆⊇⊂⊃∪∩"], +["81c8","∧∨￢⇒⇔∀∃"], +["81da","∠⊥⌒∂∇≡≒≪≫√∽∝∵∫∬"], +["81f0","ʼn♯♭♪†‡¶"], +["81fc","◯"], +["824f","０",9], +["8260","Ａ",25], +["8281","ａ",25], +["829f","ぁ",82], +["8340","ァ",62], +["8380","ム",22], +["839f","Α",16,"Σ",6], +["83bf","α",16,"σ",6], +["8440","А",5,"ЁЖ",25], +["8470","а",5,"ёж",7], +["8480","о",17], +["849f","─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂"], +["8740","①",19,"Ⅰ",9], +["875f","㍉㌔㌢㍍㌘㌧㌃㌶㍑㍗㌍㌦㌣㌫㍊㌻㎜㎝㎞㎎㎏㏄㎡"], +["877e","㍻"], +["8780","〝〟№㏍℡㊤",4,"㈱㈲㈹㍾㍽㍼≒≡∫∮∑√⊥∠∟⊿∵∩∪"], +["889f","亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏以伊位依偉囲夷委威尉惟意慰易椅為畏異移維緯胃萎衣謂違遺医井亥域育郁磯一壱溢逸稲茨芋鰯允印咽員因姻引飲淫胤蔭"], +["8940","院陰隠韻吋右宇烏羽迂雨卯鵜窺丑碓臼渦嘘唄欝蔚鰻姥厩浦瓜閏噂云運雲荏餌叡営嬰影映曳栄永泳洩瑛盈穎頴英衛詠鋭液疫益駅悦謁越閲榎厭円"], +["8980","園堰奄宴延怨掩援沿演炎焔煙燕猿縁艶苑薗遠鉛鴛塩於汚甥凹央奥往応押旺横欧殴王翁襖鴬鴎黄岡沖荻億屋憶臆桶牡乙俺卸恩温穏音下化仮何伽価佳加可嘉夏嫁家寡科暇果架歌河火珂禍禾稼箇花苛茄荷華菓蝦課嘩貨迦過霞蚊俄峨我牙画臥芽蛾賀雅餓駕介会解回塊壊廻快怪悔恢懐戒拐改"], +["8a40","魁晦械海灰界皆絵芥蟹開階貝凱劾外咳害崖慨概涯碍蓋街該鎧骸浬馨蛙垣柿蛎鈎劃嚇各廓拡撹格核殻獲確穫覚角赫較郭閣隔革学岳楽額顎掛笠樫"], +["8a80","橿梶鰍潟割喝恰括活渇滑葛褐轄且鰹叶椛樺鞄株兜竃蒲釜鎌噛鴨栢茅萱粥刈苅瓦乾侃冠寒刊勘勧巻喚堪姦完官寛干幹患感慣憾換敢柑桓棺款歓汗漢澗潅環甘監看竿管簡緩缶翰肝艦莞観諌貫還鑑間閑関陥韓館舘丸含岸巌玩癌眼岩翫贋雁頑顔願企伎危喜器基奇嬉寄岐希幾忌揮机旗既期棋棄"], +["8b40","機帰毅気汽畿祈季稀紀徽規記貴起軌輝飢騎鬼亀偽儀妓宜戯技擬欺犠疑祇義蟻誼議掬菊鞠吉吃喫桔橘詰砧杵黍却客脚虐逆丘久仇休及吸宮弓急救"], +["8b80","朽求汲泣灸球究窮笈級糾給旧牛去居巨拒拠挙渠虚許距鋸漁禦魚亨享京供侠僑兇競共凶協匡卿叫喬境峡強彊怯恐恭挟教橋況狂狭矯胸脅興蕎郷鏡響饗驚仰凝尭暁業局曲極玉桐粁僅勤均巾錦斤欣欽琴禁禽筋緊芹菌衿襟謹近金吟銀九倶句区狗玖矩苦躯駆駈駒具愚虞喰空偶寓遇隅串櫛釧屑屈"], +["8c40","掘窟沓靴轡窪熊隈粂栗繰桑鍬勲君薫訓群軍郡卦袈祁係傾刑兄啓圭珪型契形径恵慶慧憩掲携敬景桂渓畦稽系経継繋罫茎荊蛍計詣警軽頚鶏芸迎鯨"], +["8c80","劇戟撃激隙桁傑欠決潔穴結血訣月件倹倦健兼券剣喧圏堅嫌建憲懸拳捲検権牽犬献研硯絹県肩見謙賢軒遣鍵険顕験鹸元原厳幻弦減源玄現絃舷言諺限乎個古呼固姑孤己庫弧戸故枯湖狐糊袴股胡菰虎誇跨鈷雇顧鼓五互伍午呉吾娯後御悟梧檎瑚碁語誤護醐乞鯉交佼侯候倖光公功効勾厚口向"], +["8d40","后喉坑垢好孔孝宏工巧巷幸広庚康弘恒慌抗拘控攻昂晃更杭校梗構江洪浩港溝甲皇硬稿糠紅紘絞綱耕考肯肱腔膏航荒行衡講貢購郊酵鉱砿鋼閤降"], +["8d80","項香高鴻剛劫号合壕拷濠豪轟麹克刻告国穀酷鵠黒獄漉腰甑忽惚骨狛込此頃今困坤墾婚恨懇昏昆根梱混痕紺艮魂些佐叉唆嵯左差査沙瑳砂詐鎖裟坐座挫債催再最哉塞妻宰彩才採栽歳済災采犀砕砦祭斎細菜裁載際剤在材罪財冴坂阪堺榊肴咲崎埼碕鷺作削咋搾昨朔柵窄策索錯桜鮭笹匙冊刷"], +["8e40","察拶撮擦札殺薩雑皐鯖捌錆鮫皿晒三傘参山惨撒散桟燦珊産算纂蚕讃賛酸餐斬暫残仕仔伺使刺司史嗣四士始姉姿子屍市師志思指支孜斯施旨枝止"], +["8e80","死氏獅祉私糸紙紫肢脂至視詞詩試誌諮資賜雌飼歯事似侍児字寺慈持時次滋治爾璽痔磁示而耳自蒔辞汐鹿式識鴫竺軸宍雫七叱執失嫉室悉湿漆疾質実蔀篠偲柴芝屡蕊縞舎写射捨赦斜煮社紗者謝車遮蛇邪借勺尺杓灼爵酌釈錫若寂弱惹主取守手朱殊狩珠種腫趣酒首儒受呪寿授樹綬需囚収周"], +["8f40","宗就州修愁拾洲秀秋終繍習臭舟蒐衆襲讐蹴輯週酋酬集醜什住充十従戎柔汁渋獣縦重銃叔夙宿淑祝縮粛塾熟出術述俊峻春瞬竣舜駿准循旬楯殉淳"], +["8f80","準潤盾純巡遵醇順処初所暑曙渚庶緒署書薯藷諸助叙女序徐恕鋤除傷償勝匠升召哨商唱嘗奨妾娼宵将小少尚庄床廠彰承抄招掌捷昇昌昭晶松梢樟樵沼消渉湘焼焦照症省硝礁祥称章笑粧紹肖菖蒋蕉衝裳訟証詔詳象賞醤鉦鍾鐘障鞘上丈丞乗冗剰城場壌嬢常情擾条杖浄状畳穣蒸譲醸錠嘱埴飾"], +["9040","拭植殖燭織職色触食蝕辱尻伸信侵唇娠寝審心慎振新晋森榛浸深申疹真神秦紳臣芯薪親診身辛進針震人仁刃塵壬尋甚尽腎訊迅陣靭笥諏須酢図厨"], +["9080","逗吹垂帥推水炊睡粋翠衰遂酔錐錘随瑞髄崇嵩数枢趨雛据杉椙菅頗雀裾澄摺寸世瀬畝是凄制勢姓征性成政整星晴棲栖正清牲生盛精聖声製西誠誓請逝醒青静斉税脆隻席惜戚斥昔析石積籍績脊責赤跡蹟碩切拙接摂折設窃節説雪絶舌蝉仙先千占宣専尖川戦扇撰栓栴泉浅洗染潜煎煽旋穿箭線"], +["9140","繊羨腺舛船薦詮賎践選遷銭銑閃鮮前善漸然全禅繕膳糎噌塑岨措曾曽楚狙疏疎礎祖租粗素組蘇訴阻遡鼠僧創双叢倉喪壮奏爽宋層匝惣想捜掃挿掻"], +["9180","操早曹巣槍槽漕燥争痩相窓糟総綜聡草荘葬蒼藻装走送遭鎗霜騒像増憎臓蔵贈造促側則即息捉束測足速俗属賊族続卒袖其揃存孫尊損村遜他多太汰詑唾堕妥惰打柁舵楕陀駄騨体堆対耐岱帯待怠態戴替泰滞胎腿苔袋貸退逮隊黛鯛代台大第醍題鷹滝瀧卓啄宅托択拓沢濯琢託鐸濁諾茸凧蛸只"], +["9240","叩但達辰奪脱巽竪辿棚谷狸鱈樽誰丹単嘆坦担探旦歎淡湛炭短端箪綻耽胆蛋誕鍛団壇弾断暖檀段男談値知地弛恥智池痴稚置致蜘遅馳築畜竹筑蓄"], +["9280","逐秩窒茶嫡着中仲宙忠抽昼柱注虫衷註酎鋳駐樗瀦猪苧著貯丁兆凋喋寵帖帳庁弔張彫徴懲挑暢朝潮牒町眺聴脹腸蝶調諜超跳銚長頂鳥勅捗直朕沈珍賃鎮陳津墜椎槌追鎚痛通塚栂掴槻佃漬柘辻蔦綴鍔椿潰坪壷嬬紬爪吊釣鶴亭低停偵剃貞呈堤定帝底庭廷弟悌抵挺提梯汀碇禎程締艇訂諦蹄逓"], +["9340","邸鄭釘鼎泥摘擢敵滴的笛適鏑溺哲徹撤轍迭鉄典填天展店添纏甜貼転顛点伝殿澱田電兎吐堵塗妬屠徒斗杜渡登菟賭途都鍍砥砺努度土奴怒倒党冬"], +["9380","凍刀唐塔塘套宕島嶋悼投搭東桃梼棟盗淘湯涛灯燈当痘祷等答筒糖統到董蕩藤討謄豆踏逃透鐙陶頭騰闘働動同堂導憧撞洞瞳童胴萄道銅峠鴇匿得徳涜特督禿篤毒独読栃橡凸突椴届鳶苫寅酉瀞噸屯惇敦沌豚遁頓呑曇鈍奈那内乍凪薙謎灘捺鍋楢馴縄畷南楠軟難汝二尼弐迩匂賑肉虹廿日乳入"], +["9440","如尿韮任妊忍認濡禰祢寧葱猫熱年念捻撚燃粘乃廼之埜嚢悩濃納能脳膿農覗蚤巴把播覇杷波派琶破婆罵芭馬俳廃拝排敗杯盃牌背肺輩配倍培媒梅"], +["9480","楳煤狽買売賠陪這蝿秤矧萩伯剥博拍柏泊白箔粕舶薄迫曝漠爆縛莫駁麦函箱硲箸肇筈櫨幡肌畑畠八鉢溌発醗髪伐罰抜筏閥鳩噺塙蛤隼伴判半反叛帆搬斑板氾汎版犯班畔繁般藩販範釆煩頒飯挽晩番盤磐蕃蛮匪卑否妃庇彼悲扉批披斐比泌疲皮碑秘緋罷肥被誹費避非飛樋簸備尾微枇毘琵眉美"], +["9540","鼻柊稗匹疋髭彦膝菱肘弼必畢筆逼桧姫媛紐百謬俵彪標氷漂瓢票表評豹廟描病秒苗錨鋲蒜蛭鰭品彬斌浜瀕貧賓頻敏瓶不付埠夫婦富冨布府怖扶敷"], +["9580","斧普浮父符腐膚芙譜負賦赴阜附侮撫武舞葡蕪部封楓風葺蕗伏副復幅服福腹複覆淵弗払沸仏物鮒分吻噴墳憤扮焚奮粉糞紛雰文聞丙併兵塀幣平弊柄並蔽閉陛米頁僻壁癖碧別瞥蔑箆偏変片篇編辺返遍便勉娩弁鞭保舗鋪圃捕歩甫補輔穂募墓慕戊暮母簿菩倣俸包呆報奉宝峰峯崩庖抱捧放方朋"], +["9640","法泡烹砲縫胞芳萌蓬蜂褒訪豊邦鋒飽鳳鵬乏亡傍剖坊妨帽忘忙房暴望某棒冒紡肪膨謀貌貿鉾防吠頬北僕卜墨撲朴牧睦穆釦勃没殆堀幌奔本翻凡盆"], +["9680","摩磨魔麻埋妹昧枚毎哩槙幕膜枕鮪柾鱒桝亦俣又抹末沫迄侭繭麿万慢満漫蔓味未魅巳箕岬密蜜湊蓑稔脈妙粍民眠務夢無牟矛霧鵡椋婿娘冥名命明盟迷銘鳴姪牝滅免棉綿緬面麺摸模茂妄孟毛猛盲網耗蒙儲木黙目杢勿餅尤戻籾貰問悶紋門匁也冶夜爺耶野弥矢厄役約薬訳躍靖柳薮鑓愉愈油癒"], +["9740","諭輸唯佑優勇友宥幽悠憂揖有柚湧涌猶猷由祐裕誘遊邑郵雄融夕予余与誉輿預傭幼妖容庸揚揺擁曜楊様洋溶熔用窯羊耀葉蓉要謡踊遥陽養慾抑欲"], +["9780","沃浴翌翼淀羅螺裸来莱頼雷洛絡落酪乱卵嵐欄濫藍蘭覧利吏履李梨理璃痢裏裡里離陸律率立葎掠略劉流溜琉留硫粒隆竜龍侶慮旅虜了亮僚両凌寮料梁涼猟療瞭稜糧良諒遼量陵領力緑倫厘林淋燐琳臨輪隣鱗麟瑠塁涙累類令伶例冷励嶺怜玲礼苓鈴隷零霊麗齢暦歴列劣烈裂廉恋憐漣煉簾練聯"], +["9840","蓮連錬呂魯櫓炉賂路露労婁廊弄朗楼榔浪漏牢狼篭老聾蝋郎六麓禄肋録論倭和話歪賄脇惑枠鷲亙亘鰐詫藁蕨椀湾碗腕"], +["989f","弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞亟亠亢亰亳亶从仍仄仆仂仗仞仭仟价伉佚估佛佝佗佇佶侈侏侘佻佩佰侑佯來侖儘俔俟俎俘俛俑俚俐俤俥倚倨倔倪倥倅伜俶倡倩倬俾俯們倆偃假會偕偐偈做偖偬偸傀傚傅傴傲"], +["9940","僉僊傳僂僖僞僥僭僣僮價僵儉儁儂儖儕儔儚儡儺儷儼儻儿兀兒兌兔兢竸兩兪兮冀冂囘册冉冏冑冓冕冖冤冦冢冩冪冫决冱冲冰况冽凅凉凛几處凩凭"], +["9980","凰凵凾刄刋刔刎刧刪刮刳刹剏剄剋剌剞剔剪剴剩剳剿剽劍劔劒剱劈劑辨辧劬劭劼劵勁勍勗勞勣勦飭勠勳勵勸勹匆匈甸匍匐匏匕匚匣匯匱匳匸區卆卅丗卉卍凖卞卩卮夘卻卷厂厖厠厦厥厮厰厶參簒雙叟曼燮叮叨叭叺吁吽呀听吭吼吮吶吩吝呎咏呵咎呟呱呷呰咒呻咀呶咄咐咆哇咢咸咥咬哄哈咨"], +["9a40","咫哂咤咾咼哘哥哦唏唔哽哮哭哺哢唹啀啣啌售啜啅啖啗唸唳啝喙喀咯喊喟啻啾喘喞單啼喃喩喇喨嗚嗅嗟嗄嗜嗤嗔嘔嗷嘖嗾嗽嘛嗹噎噐營嘴嘶嘲嘸"], +["9a80","噫噤嘯噬噪嚆嚀嚊嚠嚔嚏嚥嚮嚶嚴囂嚼囁囃囀囈囎囑囓囗囮囹圀囿圄圉圈國圍圓團圖嗇圜圦圷圸坎圻址坏坩埀垈坡坿垉垓垠垳垤垪垰埃埆埔埒埓堊埖埣堋堙堝塲堡塢塋塰毀塒堽塹墅墹墟墫墺壞墻墸墮壅壓壑壗壙壘壥壜壤壟壯壺壹壻壼壽夂夊夐夛梦夥夬夭夲夸夾竒奕奐奎奚奘奢奠奧奬奩"], +["9b40","奸妁妝佞侫妣妲姆姨姜妍姙姚娥娟娑娜娉娚婀婬婉娵娶婢婪媚媼媾嫋嫂媽嫣嫗嫦嫩嫖嫺嫻嬌嬋嬖嬲嫐嬪嬶嬾孃孅孀孑孕孚孛孥孩孰孳孵學斈孺宀"], +["9b80","它宦宸寃寇寉寔寐寤實寢寞寥寫寰寶寳尅將專對尓尠尢尨尸尹屁屆屎屓屐屏孱屬屮乢屶屹岌岑岔妛岫岻岶岼岷峅岾峇峙峩峽峺峭嶌峪崋崕崗嵜崟崛崑崔崢崚崙崘嵌嵒嵎嵋嵬嵳嵶嶇嶄嶂嶢嶝嶬嶮嶽嶐嶷嶼巉巍巓巒巖巛巫已巵帋帚帙帑帛帶帷幄幃幀幎幗幔幟幢幤幇幵并幺麼广庠廁廂廈廐廏"], +["9c40","廖廣廝廚廛廢廡廨廩廬廱廳廰廴廸廾弃弉彝彜弋弑弖弩弭弸彁彈彌彎弯彑彖彗彙彡彭彳彷徃徂彿徊很徑徇從徙徘徠徨徭徼忖忻忤忸忱忝悳忿怡恠"], +["9c80","怙怐怩怎怱怛怕怫怦怏怺恚恁恪恷恟恊恆恍恣恃恤恂恬恫恙悁悍惧悃悚悄悛悖悗悒悧悋惡悸惠惓悴忰悽惆悵惘慍愕愆惶惷愀惴惺愃愡惻惱愍愎慇愾愨愧慊愿愼愬愴愽慂慄慳慷慘慙慚慫慴慯慥慱慟慝慓慵憙憖憇憬憔憚憊憑憫憮懌懊應懷懈懃懆憺懋罹懍懦懣懶懺懴懿懽懼懾戀戈戉戍戌戔戛"], +["9d40","戞戡截戮戰戲戳扁扎扞扣扛扠扨扼抂抉找抒抓抖拔抃抔拗拑抻拏拿拆擔拈拜拌拊拂拇抛拉挌拮拱挧挂挈拯拵捐挾捍搜捏掖掎掀掫捶掣掏掉掟掵捫"], +["9d80","捩掾揩揀揆揣揉插揶揄搖搴搆搓搦搶攝搗搨搏摧摯摶摎攪撕撓撥撩撈撼據擒擅擇撻擘擂擱擧舉擠擡抬擣擯攬擶擴擲擺攀擽攘攜攅攤攣攫攴攵攷收攸畋效敖敕敍敘敞敝敲數斂斃變斛斟斫斷旃旆旁旄旌旒旛旙无旡旱杲昊昃旻杳昵昶昴昜晏晄晉晁晞晝晤晧晨晟晢晰暃暈暎暉暄暘暝曁暹曉暾暼"], +["9e40","曄暸曖曚曠昿曦曩曰曵曷朏朖朞朦朧霸朮朿朶杁朸朷杆杞杠杙杣杤枉杰枩杼杪枌枋枦枡枅枷柯枴柬枳柩枸柤柞柝柢柮枹柎柆柧檜栞框栩桀桍栲桎"], +["9e80","梳栫桙档桷桿梟梏梭梔條梛梃檮梹桴梵梠梺椏梍桾椁棊椈棘椢椦棡椌棍棔棧棕椶椒椄棗棣椥棹棠棯椨椪椚椣椡棆楹楷楜楸楫楔楾楮椹楴椽楙椰楡楞楝榁楪榲榮槐榿槁槓榾槎寨槊槝榻槃榧樮榑榠榜榕榴槞槨樂樛槿權槹槲槧樅榱樞槭樔槫樊樒櫁樣樓橄樌橲樶橸橇橢橙橦橈樸樢檐檍檠檄檢檣"], +["9f40","檗蘗檻櫃櫂檸檳檬櫞櫑櫟檪櫚櫪櫻欅蘖櫺欒欖鬱欟欸欷盜欹飮歇歃歉歐歙歔歛歟歡歸歹歿殀殄殃殍殘殕殞殤殪殫殯殲殱殳殷殼毆毋毓毟毬毫毳毯"], +["9f80","麾氈氓气氛氤氣汞汕汢汪沂沍沚沁沛汾汨汳沒沐泄泱泓沽泗泅泝沮沱沾沺泛泯泙泪洟衍洶洫洽洸洙洵洳洒洌浣涓浤浚浹浙涎涕濤涅淹渕渊涵淇淦涸淆淬淞淌淨淒淅淺淙淤淕淪淮渭湮渮渙湲湟渾渣湫渫湶湍渟湃渺湎渤滿渝游溂溪溘滉溷滓溽溯滄溲滔滕溏溥滂溟潁漑灌滬滸滾漿滲漱滯漲滌"], +["e040","漾漓滷澆潺潸澁澀潯潛濳潭澂潼潘澎澑濂潦澳澣澡澤澹濆澪濟濕濬濔濘濱濮濛瀉瀋濺瀑瀁瀏濾瀛瀚潴瀝瀘瀟瀰瀾瀲灑灣炙炒炯烱炬炸炳炮烟烋烝"], +["e080","烙焉烽焜焙煥煕熈煦煢煌煖煬熏燻熄熕熨熬燗熹熾燒燉燔燎燠燬燧燵燼燹燿爍爐爛爨爭爬爰爲爻爼爿牀牆牋牘牴牾犂犁犇犒犖犢犧犹犲狃狆狄狎狒狢狠狡狹狷倏猗猊猜猖猝猴猯猩猥猾獎獏默獗獪獨獰獸獵獻獺珈玳珎玻珀珥珮珞璢琅瑯琥珸琲琺瑕琿瑟瑙瑁瑜瑩瑰瑣瑪瑶瑾璋璞璧瓊瓏瓔珱"], +["e140","瓠瓣瓧瓩瓮瓲瓰瓱瓸瓷甄甃甅甌甎甍甕甓甞甦甬甼畄畍畊畉畛畆畚畩畤畧畫畭畸當疆疇畴疊疉疂疔疚疝疥疣痂疳痃疵疽疸疼疱痍痊痒痙痣痞痾痿"], +["e180","痼瘁痰痺痲痳瘋瘍瘉瘟瘧瘠瘡瘢瘤瘴瘰瘻癇癈癆癜癘癡癢癨癩癪癧癬癰癲癶癸發皀皃皈皋皎皖皓皙皚皰皴皸皹皺盂盍盖盒盞盡盥盧盪蘯盻眈眇眄眩眤眞眥眦眛眷眸睇睚睨睫睛睥睿睾睹瞎瞋瞑瞠瞞瞰瞶瞹瞿瞼瞽瞻矇矍矗矚矜矣矮矼砌砒礦砠礪硅碎硴碆硼碚碌碣碵碪碯磑磆磋磔碾碼磅磊磬"], +["e240","磧磚磽磴礇礒礑礙礬礫祀祠祗祟祚祕祓祺祿禊禝禧齋禪禮禳禹禺秉秕秧秬秡秣稈稍稘稙稠稟禀稱稻稾稷穃穗穉穡穢穩龝穰穹穽窈窗窕窘窖窩竈窰"], +["e280","窶竅竄窿邃竇竊竍竏竕竓站竚竝竡竢竦竭竰笂笏笊笆笳笘笙笞笵笨笶筐筺笄筍笋筌筅筵筥筴筧筰筱筬筮箝箘箟箍箜箚箋箒箏筝箙篋篁篌篏箴篆篝篩簑簔篦篥籠簀簇簓篳篷簗簍篶簣簧簪簟簷簫簽籌籃籔籏籀籐籘籟籤籖籥籬籵粃粐粤粭粢粫粡粨粳粲粱粮粹粽糀糅糂糘糒糜糢鬻糯糲糴糶糺紆"], +["e340","紂紜紕紊絅絋紮紲紿紵絆絳絖絎絲絨絮絏絣經綉絛綏絽綛綺綮綣綵緇綽綫總綢綯緜綸綟綰緘緝緤緞緻緲緡縅縊縣縡縒縱縟縉縋縢繆繦縻縵縹繃縷"], +["e380","縲縺繧繝繖繞繙繚繹繪繩繼繻纃緕繽辮繿纈纉續纒纐纓纔纖纎纛纜缸缺罅罌罍罎罐网罕罔罘罟罠罨罩罧罸羂羆羃羈羇羌羔羞羝羚羣羯羲羹羮羶羸譱翅翆翊翕翔翡翦翩翳翹飜耆耄耋耒耘耙耜耡耨耿耻聊聆聒聘聚聟聢聨聳聲聰聶聹聽聿肄肆肅肛肓肚肭冐肬胛胥胙胝胄胚胖脉胯胱脛脩脣脯腋"], +["e440","隋腆脾腓腑胼腱腮腥腦腴膃膈膊膀膂膠膕膤膣腟膓膩膰膵膾膸膽臀臂膺臉臍臑臙臘臈臚臟臠臧臺臻臾舁舂舅與舊舍舐舖舩舫舸舳艀艙艘艝艚艟艤"], +["e480","艢艨艪艫舮艱艷艸艾芍芒芫芟芻芬苡苣苟苒苴苳苺莓范苻苹苞茆苜茉苙茵茴茖茲茱荀茹荐荅茯茫茗茘莅莚莪莟莢莖茣莎莇莊荼莵荳荵莠莉莨菴萓菫菎菽萃菘萋菁菷萇菠菲萍萢萠莽萸蔆菻葭萪萼蕚蒄葷葫蒭葮蒂葩葆萬葯葹萵蓊葢蒹蒿蒟蓙蓍蒻蓚蓐蓁蓆蓖蒡蔡蓿蓴蔗蔘蔬蔟蔕蔔蓼蕀蕣蕘蕈"], +["e540","蕁蘂蕋蕕薀薤薈薑薊薨蕭薔薛藪薇薜蕷蕾薐藉薺藏薹藐藕藝藥藜藹蘊蘓蘋藾藺蘆蘢蘚蘰蘿虍乕虔號虧虱蚓蚣蚩蚪蚋蚌蚶蚯蛄蛆蚰蛉蠣蚫蛔蛞蛩蛬"], +["e580","蛟蛛蛯蜒蜆蜈蜀蜃蛻蜑蜉蜍蛹蜊蜴蜿蜷蜻蜥蜩蜚蝠蝟蝸蝌蝎蝴蝗蝨蝮蝙蝓蝣蝪蠅螢螟螂螯蟋螽蟀蟐雖螫蟄螳蟇蟆螻蟯蟲蟠蠏蠍蟾蟶蟷蠎蟒蠑蠖蠕蠢蠡蠱蠶蠹蠧蠻衄衂衒衙衞衢衫袁衾袞衵衽袵衲袂袗袒袮袙袢袍袤袰袿袱裃裄裔裘裙裝裹褂裼裴裨裲褄褌褊褓襃褞褥褪褫襁襄褻褶褸襌褝襠襞"], +["e640","襦襤襭襪襯襴襷襾覃覈覊覓覘覡覩覦覬覯覲覺覽覿觀觚觜觝觧觴觸訃訖訐訌訛訝訥訶詁詛詒詆詈詼詭詬詢誅誂誄誨誡誑誥誦誚誣諄諍諂諚諫諳諧"], +["e680","諤諱謔諠諢諷諞諛謌謇謚諡謖謐謗謠謳鞫謦謫謾謨譁譌譏譎證譖譛譚譫譟譬譯譴譽讀讌讎讒讓讖讙讚谺豁谿豈豌豎豐豕豢豬豸豺貂貉貅貊貍貎貔豼貘戝貭貪貽貲貳貮貶賈賁賤賣賚賽賺賻贄贅贊贇贏贍贐齎贓賍贔贖赧赭赱赳趁趙跂趾趺跏跚跖跌跛跋跪跫跟跣跼踈踉跿踝踞踐踟蹂踵踰踴蹊"], +["e740","蹇蹉蹌蹐蹈蹙蹤蹠踪蹣蹕蹶蹲蹼躁躇躅躄躋躊躓躑躔躙躪躡躬躰軆躱躾軅軈軋軛軣軼軻軫軾輊輅輕輒輙輓輜輟輛輌輦輳輻輹轅轂輾轌轉轆轎轗轜"], +["e780","轢轣轤辜辟辣辭辯辷迚迥迢迪迯邇迴逅迹迺逑逕逡逍逞逖逋逧逶逵逹迸遏遐遑遒逎遉逾遖遘遞遨遯遶隨遲邂遽邁邀邊邉邏邨邯邱邵郢郤扈郛鄂鄒鄙鄲鄰酊酖酘酣酥酩酳酲醋醉醂醢醫醯醪醵醴醺釀釁釉釋釐釖釟釡釛釼釵釶鈞釿鈔鈬鈕鈑鉞鉗鉅鉉鉤鉈銕鈿鉋鉐銜銖銓銛鉚鋏銹銷鋩錏鋺鍄錮"], +["e840","錙錢錚錣錺錵錻鍜鍠鍼鍮鍖鎰鎬鎭鎔鎹鏖鏗鏨鏥鏘鏃鏝鏐鏈鏤鐚鐔鐓鐃鐇鐐鐶鐫鐵鐡鐺鑁鑒鑄鑛鑠鑢鑞鑪鈩鑰鑵鑷鑽鑚鑼鑾钁鑿閂閇閊閔閖閘閙"], +["e880","閠閨閧閭閼閻閹閾闊濶闃闍闌闕闔闖關闡闥闢阡阨阮阯陂陌陏陋陷陜陞陝陟陦陲陬隍隘隕隗險隧隱隲隰隴隶隸隹雎雋雉雍襍雜霍雕雹霄霆霈霓霎霑霏霖霙霤霪霰霹霽霾靄靆靈靂靉靜靠靤靦靨勒靫靱靹鞅靼鞁靺鞆鞋鞏鞐鞜鞨鞦鞣鞳鞴韃韆韈韋韜韭齏韲竟韶韵頏頌頸頤頡頷頽顆顏顋顫顯顰"], +["e940","顱顴顳颪颯颱颶飄飃飆飩飫餃餉餒餔餘餡餝餞餤餠餬餮餽餾饂饉饅饐饋饑饒饌饕馗馘馥馭馮馼駟駛駝駘駑駭駮駱駲駻駸騁騏騅駢騙騫騷驅驂驀驃"], +["e980","騾驕驍驛驗驟驢驥驤驩驫驪骭骰骼髀髏髑髓體髞髟髢髣髦髯髫髮髴髱髷髻鬆鬘鬚鬟鬢鬣鬥鬧鬨鬩鬪鬮鬯鬲魄魃魏魍魎魑魘魴鮓鮃鮑鮖鮗鮟鮠鮨鮴鯀鯊鮹鯆鯏鯑鯒鯣鯢鯤鯔鯡鰺鯲鯱鯰鰕鰔鰉鰓鰌鰆鰈鰒鰊鰄鰮鰛鰥鰤鰡鰰鱇鰲鱆鰾鱚鱠鱧鱶鱸鳧鳬鳰鴉鴈鳫鴃鴆鴪鴦鶯鴣鴟鵄鴕鴒鵁鴿鴾鵆鵈"], +["ea40","鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻鶸鶺鷆鷏鷂鷙鷓鷸鷦鷭鷯鷽鸚鸛鸞鹵鹹鹽麁麈麋麌麒麕麑麝麥麩麸麪麭靡黌黎黏黐黔黜點黝黠黥黨黯"], +["ea80","黴黶黷黹黻黼黽鼇鼈皷鼕鼡鼬鼾齊齒齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠堯槇遙瑤凜熙"], +["ed40","纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏"], +["ed80","塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱"], +["ee40","犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙"], +["ee80","蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"], +["eeef","ⅰ",9,"￢￤＇＂"], +["f040","",62], +["f080","",124], +["f140","",62], +["f180","",124], +["f240","",62], +["f280","",124], +["f340","",62], +["f380","",124], +["f440","",62], +["f480","",124], +["f540","",62], +["f580","",124], +["f640","",62], +["f680","",124], +["f740","",62], +["f780","",124], +["f840","",62], +["f880","",124], +["f940",""], +["fa40","ⅰ",9,"Ⅰ",9,"￢￤＇＂㈱№℡∵纊褜鍈銈蓜俉炻昱棈鋹曻彅丨仡仼伀伃伹佖侒侊侚侔俍偀倢俿倞偆偰偂傔僴僘兊"], +["fa80","兤冝冾凬刕劜劦勀勛匀匇匤卲厓厲叝﨎咜咊咩哿喆坙坥垬埈埇﨏塚增墲夋奓奛奝奣妤妺孖寀甯寘寬尞岦岺峵崧嵓﨑嵂嵭嶸嶹巐弡弴彧德忞恝悅悊惞惕愠惲愑愷愰憘戓抦揵摠撝擎敎昀昕昻昉昮昞昤晥晗晙晴晳暙暠暲暿曺朎朗杦枻桒柀栁桄棏﨓楨﨔榘槢樰橫橆橳橾櫢櫤毖氿汜沆汯泚洄涇浯"], +["fb40","涖涬淏淸淲淼渹湜渧渼溿澈澵濵瀅瀇瀨炅炫焏焄煜煆煇凞燁燾犱犾猤猪獷玽珉珖珣珒琇珵琦琪琩琮瑢璉璟甁畯皂皜皞皛皦益睆劯砡硎硤硺礰礼神"], +["fb80","祥禔福禛竑竧靖竫箞精絈絜綷綠緖繒罇羡羽茁荢荿菇菶葈蒴蕓蕙蕫﨟薰蘒﨡蠇裵訒訷詹誧誾諟諸諶譓譿賰賴贒赶﨣軏﨤逸遧郞都鄕鄧釚釗釞釭釮釤釥鈆鈐鈊鈺鉀鈼鉎鉙鉑鈹鉧銧鉷鉸鋧鋗鋙鋐﨧鋕鋠鋓錥錡鋻﨨錞鋿錝錂鍰鍗鎤鏆鏞鏸鐱鑅鑈閒隆﨩隝隯霳霻靃靍靏靑靕顗顥飯飼餧館馞驎髙"], +["fc40","髜魵魲鮏鮱鮻鰀鵰鵫鶴鸙黑"] +] diff --git a/nodejs/node_modules/iconv-lite/encodings/utf16.js b/nodejs/node_modules/iconv-lite/encodings/utf16.js new file mode 100644 index 000000000..7e8f1591a --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/utf16.js @@ -0,0 +1,177 @@ +"use strict"; +var Buffer = require("buffer").Buffer; + +// Note: UTF16-LE (or UCS2) codec is Node.js native. See encodings/internal.js + +// == UTF16-BE codec. ========================================================== + +exports.utf16be = Utf16BECodec; +function Utf16BECodec() { +} + +Utf16BECodec.prototype.encoder = Utf16BEEncoder; +Utf16BECodec.prototype.decoder = Utf16BEDecoder; +Utf16BECodec.prototype.bomAware = true; + + +// -- Encoding + +function Utf16BEEncoder() { +} + +Utf16BEEncoder.prototype.write = function(str) { + var buf = new Buffer(str, 'ucs2'); + for (var i = 0; i < buf.length; i += 2) { + var tmp = buf[i]; buf[i] = buf[i+1]; buf[i+1] = tmp; + } + return buf; +} + +Utf16BEEncoder.prototype.end = function() { +} + + +// -- Decoding + +function Utf16BEDecoder() { + this.overflowByte = -1; +} + +Utf16BEDecoder.prototype.write = function(buf) { + if (buf.length == 0) + return ''; + + var buf2 = new Buffer(buf.length + 1), + i = 0, j = 0; + + if (this.overflowByte !== -1) { + buf2[0] = buf[0]; + buf2[1] = this.overflowByte; + i = 1; j = 2; + } + + for (; i < buf.length-1; i += 2, j+= 2) { + buf2[j] = buf[i+1]; + buf2[j+1] = buf[i]; + } + + this.overflowByte = (i == buf.length-1) ? buf[buf.length-1] : -1; + + return buf2.slice(0, j).toString('ucs2'); +} + +Utf16BEDecoder.prototype.end = function() { +} + + +// == UTF-16 codec ============================================================= +// Decoder chooses automatically from UTF-16LE and UTF-16BE using BOM and space-based heuristic. +// Defaults to UTF-16LE, as it's prevalent and default in Node. +// http://en.wikipedia.org/wiki/UTF-16 and http://encoding.spec.whatwg.org/#utf-16le +// Decoder default can be changed: iconv.decode(buf, 'utf16', {defaultEncoding: 'utf-16be'}); + +// Encoder uses UTF-16LE and prepends BOM (which can be overridden with addBOM: false). + +exports.utf16 = Utf16Codec; +function Utf16Codec(codecOptions, iconv) { + this.iconv = iconv; +} + +Utf16Codec.prototype.encoder = Utf16Encoder; +Utf16Codec.prototype.decoder = Utf16Decoder; + + +// -- Encoding (pass-through) + +function Utf16Encoder(options, codec) { + options = options || {}; + if (options.addBOM === undefined) + options.addBOM = true; + this.encoder = codec.iconv.getEncoder('utf-16le', options); +} + +Utf16Encoder.prototype.write = function(str) { + return this.encoder.write(str); +} + +Utf16Encoder.prototype.end = function() { + return this.encoder.end(); +} + + +// -- Decoding + +function Utf16Decoder(options, codec) { + this.decoder = null; + this.initialBytes = []; + this.initialBytesLen = 0; + + this.options = options || {}; + this.iconv = codec.iconv; +} + +Utf16Decoder.prototype.write = function(buf) { + if (!this.decoder) { + // Codec is not chosen yet. Accumulate initial bytes. + this.initialBytes.push(buf); + this.initialBytesLen += buf.length; + + if (this.initialBytesLen < 16) // We need more bytes to use space heuristic (see below) + return ''; + + // We have enough bytes -> detect endianness. + var buf = Buffer.concat(this.initialBytes), + encoding = detectEncoding(buf, this.options.defaultEncoding); + this.decoder = this.iconv.getDecoder(encoding, this.options); + this.initialBytes.length = this.initialBytesLen = 0; + } + + return this.decoder.write(buf); +} + +Utf16Decoder.prototype.end = function() { + if (!this.decoder) { + var buf = Buffer.concat(this.initialBytes), + encoding = detectEncoding(buf, this.options.defaultEncoding); + this.decoder = this.iconv.getDecoder(encoding, this.options); + + var res = this.decoder.write(buf), + trail = this.decoder.end(); + + return trail ? (res + trail) : res; + } + return this.decoder.end(); +} + +function detectEncoding(buf, defaultEncoding) { + var enc = defaultEncoding || 'utf-16le'; + + if (buf.length >= 2) { + // Check BOM. + if (buf[0] == 0xFE && buf[1] == 0xFF) // UTF-16BE BOM + enc = 'utf-16be'; + else if (buf[0] == 0xFF && buf[1] == 0xFE) // UTF-16LE BOM + enc = 'utf-16le'; + else { + // No BOM found. Try to deduce encoding from initial content. + // Most of the time, the content has ASCII chars (U+00**), but the opposite (U+**00) is uncommon. + // So, we count ASCII as if it was LE or BE, and decide from that. + var asciiCharsLE = 0, asciiCharsBE = 0, // Counts of chars in both positions + _len = Math.min(buf.length - (buf.length % 2), 64); // Len is always even. + + for (var i = 0; i < _len; i += 2) { + if (buf[i] === 0 && buf[i+1] !== 0) asciiCharsBE++; + if (buf[i] !== 0 && buf[i+1] === 0) asciiCharsLE++; + } + + if (asciiCharsBE > asciiCharsLE) + enc = 'utf-16be'; + else if (asciiCharsBE < asciiCharsLE) + enc = 'utf-16le'; + } + } + + return enc; +} + + diff --git a/nodejs/node_modules/iconv-lite/encodings/utf7.js b/nodejs/node_modules/iconv-lite/encodings/utf7.js new file mode 100644 index 000000000..19b7194aa --- /dev/null +++ b/nodejs/node_modules/iconv-lite/encodings/utf7.js @@ -0,0 +1,290 @@ +"use strict"; +var Buffer = require("buffer").Buffer; + +// UTF-7 codec, according to https://tools.ietf.org/html/rfc2152 +// See also below a UTF-7-IMAP codec, according to http://tools.ietf.org/html/rfc3501#section-5.1.3 + +exports.utf7 = Utf7Codec; +exports.unicode11utf7 = 'utf7'; // Alias UNICODE-1-1-UTF-7 +function Utf7Codec(codecOptions, iconv) { + this.iconv = iconv; +}; + +Utf7Codec.prototype.encoder = Utf7Encoder; +Utf7Codec.prototype.decoder = Utf7Decoder; +Utf7Codec.prototype.bomAware = true; + + +// -- Encoding + +var nonDirectChars = /[^A-Za-z0-9'\(\),-\.\/:\? \n\r\t]+/g; + +function Utf7Encoder(options, codec) { + this.iconv = codec.iconv; +} + +Utf7Encoder.prototype.write = function(str) { + // Naive implementation. + // Non-direct chars are encoded as "+-"; single "+" char is encoded as "+-". + return new Buffer(str.replace(nonDirectChars, function(chunk) { + return "+" + (chunk === '+' ? '' : + this.iconv.encode(chunk, 'utf16-be').toString('base64').replace(/=+$/, '')) + + "-"; + }.bind(this))); +} + +Utf7Encoder.prototype.end = function() { +} + + +// -- Decoding + +function Utf7Decoder(options, codec) { + this.iconv = codec.iconv; + this.inBase64 = false; + this.base64Accum = ''; +} + +var base64Regex = /[A-Za-z0-9\/+]/; +var base64Chars = []; +for (var i = 0; i < 256; i++) + base64Chars[i] = base64Regex.test(String.fromCharCode(i)); + +var plusChar = '+'.charCodeAt(0), + minusChar = '-'.charCodeAt(0), + andChar = '&'.charCodeAt(0); + +Utf7Decoder.prototype.write = function(buf) { + var res = "", lastI = 0, + inBase64 = this.inBase64, + base64Accum = this.base64Accum; + + // The decoder is more involved as we must handle chunks in stream. + + for (var i = 0; i < buf.length; i++) { + if (!inBase64) { // We're in direct mode. + // Write direct chars until '+' + if (buf[i] == plusChar) { + res += this.iconv.decode(buf.slice(lastI, i), "ascii"); // Write direct chars. + lastI = i+1; + inBase64 = true; + } + } else { // We decode base64. + if (!base64Chars[buf[i]]) { // Base64 ended. + if (i == lastI && buf[i] == minusChar) {// "+-" -> "+" + res += "+"; + } else { + var b64str = base64Accum + buf.slice(lastI, i).toString(); + res += this.iconv.decode(new Buffer(b64str, 'base64'), "utf16-be"); + } + + if (buf[i] != minusChar) // Minus is absorbed after base64. + i--; + + lastI = i+1; + inBase64 = false; + base64Accum = ''; + } + } + } + + if (!inBase64) { + res += this.iconv.decode(buf.slice(lastI), "ascii"); // Write direct chars. + } else { + var b64str = base64Accum + buf.slice(lastI).toString(); + + var canBeDecoded = b64str.length - (b64str.length % 8); // Minimal chunk: 2 quads -> 2x3 bytes -> 3 chars. + base64Accum = b64str.slice(canBeDecoded); // The rest will be decoded in future. + b64str = b64str.slice(0, canBeDecoded); + + res += this.iconv.decode(new Buffer(b64str, 'base64'), "utf16-be"); + } + + this.inBase64 = inBase64; + this.base64Accum = base64Accum; + + return res; +} + +Utf7Decoder.prototype.end = function() { + var res = ""; + if (this.inBase64 && this.base64Accum.length > 0) + res = this.iconv.decode(new Buffer(this.base64Accum, 'base64'), "utf16-be"); + + this.inBase64 = false; + this.base64Accum = ''; + return res; +} + + +// UTF-7-IMAP codec. +// RFC3501 Sec. 5.1.3 Modified UTF-7 (http://tools.ietf.org/html/rfc3501#section-5.1.3) +// Differences: +// * Base64 part is started by "&" instead of "+" +// * Direct characters are 0x20-0x7E, except "&" (0x26) +// * In Base64, "," is used instead of "/" +// * Base64 must not be used to represent direct characters. +// * No implicit shift back from Base64 (should always end with '-') +// * String must end in non-shifted position. +// * "-&" while in base64 is not allowed. + + +exports.utf7imap = Utf7IMAPCodec; +function Utf7IMAPCodec(codecOptions, iconv) { + this.iconv = iconv; +}; + +Utf7IMAPCodec.prototype.encoder = Utf7IMAPEncoder; +Utf7IMAPCodec.prototype.decoder = Utf7IMAPDecoder; +Utf7IMAPCodec.prototype.bomAware = true; + + +// -- Encoding + +function Utf7IMAPEncoder(options, codec) { + this.iconv = codec.iconv; + this.inBase64 = false; + this.base64Accum = new Buffer(6); + this.base64AccumIdx = 0; +} + +Utf7IMAPEncoder.prototype.write = function(str) { + var inBase64 = this.inBase64, + base64Accum = this.base64Accum, + base64AccumIdx = this.base64AccumIdx, + buf = new Buffer(str.length*5 + 10), bufIdx = 0; + + for (var i = 0; i < str.length; i++) { + var uChar = str.charCodeAt(i); + if (0x20 <= uChar && uChar <= 0x7E) { // Direct character or '&'. + if (inBase64) { + if (base64AccumIdx > 0) { + bufIdx += buf.write(base64Accum.slice(0, base64AccumIdx).toString('base64').replace(/\//g, ',').replace(/=+$/, ''), bufIdx); + base64AccumIdx = 0; + } + + buf[bufIdx++] = minusChar; // Write '-', then go to direct mode. + inBase64 = false; + } + + if (!inBase64) { + buf[bufIdx++] = uChar; // Write direct character + + if (uChar === andChar) // Ampersand -> '&-' + buf[bufIdx++] = minusChar; + } + + } else { // Non-direct character + if (!inBase64) { + buf[bufIdx++] = andChar; // Write '&', then go to base64 mode. + inBase64 = true; + } + if (inBase64) { + base64Accum[base64AccumIdx++] = uChar >> 8; + base64Accum[base64AccumIdx++] = uChar & 0xFF; + + if (base64AccumIdx == base64Accum.length) { + bufIdx += buf.write(base64Accum.toString('base64').replace(/\//g, ','), bufIdx); + base64AccumIdx = 0; + } + } + } + } + + this.inBase64 = inBase64; + this.base64AccumIdx = base64AccumIdx; + + return buf.slice(0, bufIdx); +} + +Utf7IMAPEncoder.prototype.end = function() { + var buf = new Buffer(10), bufIdx = 0; + if (this.inBase64) { + if (this.base64AccumIdx > 0) { + bufIdx += buf.write(this.base64Accum.slice(0, this.base64AccumIdx).toString('base64').replace(/\//g, ',').replace(/=+$/, ''), bufIdx); + this.base64AccumIdx = 0; + } + + buf[bufIdx++] = minusChar; // Write '-', then go to direct mode. + this.inBase64 = false; + } + + return buf.slice(0, bufIdx); +} + + +// -- Decoding + +function Utf7IMAPDecoder(options, codec) { + this.iconv = codec.iconv; + this.inBase64 = false; + this.base64Accum = ''; +} + +var base64IMAPChars = base64Chars.slice(); +base64IMAPChars[','.charCodeAt(0)] = true; + +Utf7IMAPDecoder.prototype.write = function(buf) { + var res = "", lastI = 0, + inBase64 = this.inBase64, + base64Accum = this.base64Accum; + + // The decoder is more involved as we must handle chunks in stream. + // It is forgiving, closer to standard UTF-7 (for example, '-' is optional at the end). + + for (var i = 0; i < buf.length; i++) { + if (!inBase64) { // We're in direct mode. + // Write direct chars until '&' + if (buf[i] == andChar) { + res += this.iconv.decode(buf.slice(lastI, i), "ascii"); // Write direct chars. + lastI = i+1; + inBase64 = true; + } + } else { // We decode base64. + if (!base64IMAPChars[buf[i]]) { // Base64 ended. + if (i == lastI && buf[i] == minusChar) { // "&-" -> "&" + res += "&"; + } else { + var b64str = base64Accum + buf.slice(lastI, i).toString().replace(/,/g, '/'); + res += this.iconv.decode(new Buffer(b64str, 'base64'), "utf16-be"); + } + + if (buf[i] != minusChar) // Minus may be absorbed after base64. + i--; + + lastI = i+1; + inBase64 = false; + base64Accum = ''; + } + } + } + + if (!inBase64) { + res += this.iconv.decode(buf.slice(lastI), "ascii"); // Write direct chars. + } else { + var b64str = base64Accum + buf.slice(lastI).toString().replace(/,/g, '/'); + + var canBeDecoded = b64str.length - (b64str.length % 8); // Minimal chunk: 2 quads -> 2x3 bytes -> 3 chars. + base64Accum = b64str.slice(canBeDecoded); // The rest will be decoded in future. + b64str = b64str.slice(0, canBeDecoded); + + res += this.iconv.decode(new Buffer(b64str, 'base64'), "utf16-be"); + } + + this.inBase64 = inBase64; + this.base64Accum = base64Accum; + + return res; +} + +Utf7IMAPDecoder.prototype.end = function() { + var res = ""; + if (this.inBase64 && this.base64Accum.length > 0) + res = this.iconv.decode(new Buffer(this.base64Accum, 'base64'), "utf16-be"); + + this.inBase64 = false; + this.base64Accum = ''; + return res; +} + + diff --git a/nodejs/node_modules/iconv-lite/lib/bom-handling.js b/nodejs/node_modules/iconv-lite/lib/bom-handling.js new file mode 100644 index 000000000..105087238 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/lib/bom-handling.js @@ -0,0 +1,52 @@ +"use strict"; + +var BOMChar = '\uFEFF'; + +exports.PrependBOM = PrependBOMWrapper +function PrependBOMWrapper(encoder, options) { + this.encoder = encoder; + this.addBOM = true; +} + +PrependBOMWrapper.prototype.write = function(str) { + if (this.addBOM) { + str = BOMChar + str; + this.addBOM = false; + } + + return this.encoder.write(str); +} + +PrependBOMWrapper.prototype.end = function() { + return this.encoder.end(); +} + + +//------------------------------------------------------------------------------ + +exports.StripBOM = StripBOMWrapper; +function StripBOMWrapper(decoder, options) { + this.decoder = decoder; + this.pass = false; + this.options = options || {}; +} + +StripBOMWrapper.prototype.write = function(buf) { + var res = this.decoder.write(buf); + if (this.pass || !res) + return res; + + if (res[0] === BOMChar) { + res = res.slice(1); + if (typeof this.options.stripBOM === 'function') + this.options.stripBOM(); + } + + this.pass = true; + return res; +} + +StripBOMWrapper.prototype.end = function() { + return this.decoder.end(); +} + diff --git a/nodejs/node_modules/iconv-lite/lib/extend-node.js b/nodejs/node_modules/iconv-lite/lib/extend-node.js new file mode 100644 index 000000000..a120400be --- /dev/null +++ b/nodejs/node_modules/iconv-lite/lib/extend-node.js @@ -0,0 +1,215 @@ +"use strict"; +var Buffer = require("buffer").Buffer; + +// == Extend Node primitives to use iconv-lite ================================= + +module.exports = function (iconv) { + var original = undefined; // Place to keep original methods. + + // Node authors rewrote Buffer internals to make it compatible with + // Uint8Array and we cannot patch key functions since then. + iconv.supportsNodeEncodingsExtension = !(new Buffer(0) instanceof Uint8Array); + + iconv.extendNodeEncodings = function extendNodeEncodings() { + if (original) return; + original = {}; + + if (!iconv.supportsNodeEncodingsExtension) { + console.error("ACTION NEEDED: require('iconv-lite').extendNodeEncodings() is not supported in your version of Node"); + console.error("See more info at https://github.com/ashtuchkin/iconv-lite/wiki/Node-v4-compatibility"); + return; + } + + var nodeNativeEncodings = { + 'hex': true, 'utf8': true, 'utf-8': true, 'ascii': true, 'binary': true, + 'base64': true, 'ucs2': true, 'ucs-2': true, 'utf16le': true, 'utf-16le': true, + }; + + Buffer.isNativeEncoding = function(enc) { + return enc && nodeNativeEncodings[enc.toLowerCase()]; + } + + // -- SlowBuffer ----------------------------------------------------------- + var SlowBuffer = require('buffer').SlowBuffer; + + original.SlowBufferToString = SlowBuffer.prototype.toString; + SlowBuffer.prototype.toString = function(encoding, start, end) { + encoding = String(encoding || 'utf8').toLowerCase(); + + // Use native conversion when possible + if (Buffer.isNativeEncoding(encoding)) + return original.SlowBufferToString.call(this, encoding, start, end); + + // Otherwise, use our decoding method. + if (typeof start == 'undefined') start = 0; + if (typeof end == 'undefined') end = this.length; + return iconv.decode(this.slice(start, end), encoding); + } + + original.SlowBufferWrite = SlowBuffer.prototype.write; + SlowBuffer.prototype.write = function(string, offset, length, encoding) { + // Support both (string, offset, length, encoding) + // and the legacy (string, encoding, offset, length) + if (isFinite(offset)) { + if (!isFinite(length)) { + encoding = length; + length = undefined; + } + } else { // legacy + var swap = encoding; + encoding = offset; + offset = length; + length = swap; + } + + offset = +offset || 0; + var remaining = this.length - offset; + if (!length) { + length = remaining; + } else { + length = +length; + if (length > remaining) { + length = remaining; + } + } + encoding = String(encoding || 'utf8').toLowerCase(); + + // Use native conversion when possible + if (Buffer.isNativeEncoding(encoding)) + return original.SlowBufferWrite.call(this, string, offset, length, encoding); + + if (string.length > 0 && (length < 0 || offset < 0)) + throw new RangeError('attempt to write beyond buffer bounds'); + + // Otherwise, use our encoding method. + var buf = iconv.encode(string, encoding); + if (buf.length < length) length = buf.length; + buf.copy(this, offset, 0, length); + return length; + } + + // -- Buffer --------------------------------------------------------------- + + original.BufferIsEncoding = Buffer.isEncoding; + Buffer.isEncoding = function(encoding) { + return Buffer.isNativeEncoding(encoding) || iconv.encodingExists(encoding); + } + + original.BufferByteLength = Buffer.byteLength; + Buffer.byteLength = SlowBuffer.byteLength = function(str, encoding) { + encoding = String(encoding || 'utf8').toLowerCase(); + + // Use native conversion when possible + if (Buffer.isNativeEncoding(encoding)) + return original.BufferByteLength.call(this, str, encoding); + + // Slow, I know, but we don't have a better way yet. + return iconv.encode(str, encoding).length; + } + + original.BufferToString = Buffer.prototype.toString; + Buffer.prototype.toString = function(encoding, start, end) { + encoding = String(encoding || 'utf8').toLowerCase(); + + // Use native conversion when possible + if (Buffer.isNativeEncoding(encoding)) + return original.BufferToString.call(this, encoding, start, end); + + // Otherwise, use our decoding method. + if (typeof start == 'undefined') start = 0; + if (typeof end == 'undefined') end = this.length; + return iconv.decode(this.slice(start, end), encoding); + } + + original.BufferWrite = Buffer.prototype.write; + Buffer.prototype.write = function(string, offset, length, encoding) { + var _offset = offset, _length = length, _encoding = encoding; + // Support both (string, offset, length, encoding) + // and the legacy (string, encoding, offset, length) + if (isFinite(offset)) { + if (!isFinite(length)) { + encoding = length; + length = undefined; + } + } else { // legacy + var swap = encoding; + encoding = offset; + offset = length; + length = swap; + } + + encoding = String(encoding || 'utf8').toLowerCase(); + + // Use native conversion when possible + if (Buffer.isNativeEncoding(encoding)) + return original.BufferWrite.call(this, string, _offset, _length, _encoding); + + offset = +offset || 0; + var remaining = this.length - offset; + if (!length) { + length = remaining; + } else { + length = +length; + if (length > remaining) { + length = remaining; + } + } + + if (string.length > 0 && (length < 0 || offset < 0)) + throw new RangeError('attempt to write beyond buffer bounds'); + + // Otherwise, use our encoding method. + var buf = iconv.encode(string, encoding); + if (buf.length < length) length = buf.length; + buf.copy(this, offset, 0, length); + return length; + + // TODO: Set _charsWritten. + } + + + // -- Readable ------------------------------------------------------------- + if (iconv.supportsStreams) { + var Readable = require('stream').Readable; + + original.ReadableSetEncoding = Readable.prototype.setEncoding; + Readable.prototype.setEncoding = function setEncoding(enc, options) { + // Use our own decoder, it has the same interface. + // We cannot use original function as it doesn't handle BOM-s. + this._readableState.decoder = iconv.getDecoder(enc, options); + this._readableState.encoding = enc; + } + + Readable.prototype.collect = iconv._collect; + } + } + + // Remove iconv-lite Node primitive extensions. + iconv.undoExtendNodeEncodings = function undoExtendNodeEncodings() { + if (!iconv.supportsNodeEncodingsExtension) + return; + if (!original) + throw new Error("require('iconv-lite').undoExtendNodeEncodings(): Nothing to undo; extendNodeEncodings() is not called.") + + delete Buffer.isNativeEncoding; + + var SlowBuffer = require('buffer').SlowBuffer; + + SlowBuffer.prototype.toString = original.SlowBufferToString; + SlowBuffer.prototype.write = original.SlowBufferWrite; + + Buffer.isEncoding = original.BufferIsEncoding; + Buffer.byteLength = original.BufferByteLength; + Buffer.prototype.toString = original.BufferToString; + Buffer.prototype.write = original.BufferWrite; + + if (iconv.supportsStreams) { + var Readable = require('stream').Readable; + + Readable.prototype.setEncoding = original.ReadableSetEncoding; + delete Readable.prototype.collect; + } + + original = undefined; + } +} diff --git a/nodejs/node_modules/iconv-lite/lib/index.d.ts b/nodejs/node_modules/iconv-lite/lib/index.d.ts new file mode 100644 index 000000000..b9c83613e --- /dev/null +++ b/nodejs/node_modules/iconv-lite/lib/index.d.ts @@ -0,0 +1,24 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. + * REQUIREMENT: This definition is dependent on the @types/node definition. + * Install with `npm install @types/node --save-dev` + *--------------------------------------------------------------------------------------------*/ + +declare module 'iconv-lite' { + export function decode(buffer: NodeBuffer, encoding: string, options?: Options): string; + + export function encode(content: string, encoding: string, options?: Options): NodeBuffer; + + export function encodingExists(encoding: string): boolean; + + export function decodeStream(encoding: string, options?: Options): NodeJS.ReadWriteStream; + + export function encodeStream(encoding: string, options?: Options): NodeJS.ReadWriteStream; +} + +export interface Options { + stripBOM?: boolean; + addBOM?: boolean; + defaultEncoding?: string; +} diff --git a/nodejs/node_modules/iconv-lite/lib/index.js b/nodejs/node_modules/iconv-lite/lib/index.js new file mode 100644 index 000000000..9a5247212 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/lib/index.js @@ -0,0 +1,148 @@ +"use strict"; + +// Some environments don't have global Buffer (e.g. React Native). +// Solution would be installing npm modules "buffer" and "stream" explicitly. +var Buffer = require("buffer").Buffer; + +var bomHandling = require("./bom-handling"), + iconv = module.exports; + +// All codecs and aliases are kept here, keyed by encoding name/alias. +// They are lazy loaded in `iconv.getCodec` from `encodings/index.js`. +iconv.encodings = null; + +// Characters emitted in case of error. +iconv.defaultCharUnicode = '�'; +iconv.defaultCharSingleByte = '?'; + +// Public API. +iconv.encode = function encode(str, encoding, options) { + str = "" + (str || ""); // Ensure string. + + var encoder = iconv.getEncoder(encoding, options); + + var res = encoder.write(str); + var trail = encoder.end(); + + return (trail && trail.length > 0) ? Buffer.concat([res, trail]) : res; +} + +iconv.decode = function decode(buf, encoding, options) { + if (typeof buf === 'string') { + if (!iconv.skipDecodeWarning) { + console.error('Iconv-lite warning: decode()-ing strings is deprecated. Refer to https://github.com/ashtuchkin/iconv-lite/wiki/Use-Buffers-when-decoding'); + iconv.skipDecodeWarning = true; + } + + buf = new Buffer("" + (buf || ""), "binary"); // Ensure buffer. + } + + var decoder = iconv.getDecoder(encoding, options); + + var res = decoder.write(buf); + var trail = decoder.end(); + + return trail ? (res + trail) : res; +} + +iconv.encodingExists = function encodingExists(enc) { + try { + iconv.getCodec(enc); + return true; + } catch (e) { + return false; + } +} + +// Legacy aliases to convert functions +iconv.toEncoding = iconv.encode; +iconv.fromEncoding = iconv.decode; + +// Search for a codec in iconv.encodings. Cache codec data in iconv._codecDataCache. +iconv._codecDataCache = {}; +iconv.getCodec = function getCodec(encoding) { + if (!iconv.encodings) + iconv.encodings = require("../encodings"); // Lazy load all encoding definitions. + + // Canonicalize encoding name: strip all non-alphanumeric chars and appended year. + var enc = (''+encoding).toLowerCase().replace(/[^0-9a-z]|:\d{4}$/g, ""); + + // Traverse iconv.encodings to find actual codec. + var codecOptions = {}; + while (true) { + var codec = iconv._codecDataCache[enc]; + if (codec) + return codec; + + var codecDef = iconv.encodings[enc]; + + switch (typeof codecDef) { + case "string": // Direct alias to other encoding. + enc = codecDef; + break; + + case "object": // Alias with options. Can be layered. + for (var key in codecDef) + codecOptions[key] = codecDef[key]; + + if (!codecOptions.encodingName) + codecOptions.encodingName = enc; + + enc = codecDef.type; + break; + + case "function": // Codec itself. + if (!codecOptions.encodingName) + codecOptions.encodingName = enc; + + // The codec function must load all tables and return object with .encoder and .decoder methods. + // It'll be called only once (for each different options object). + codec = new codecDef(codecOptions, iconv); + + iconv._codecDataCache[codecOptions.encodingName] = codec; // Save it to be reused later. + return codec; + + default: + throw new Error("Encoding not recognized: '" + encoding + "' (searched as: '"+enc+"')"); + } + } +} + +iconv.getEncoder = function getEncoder(encoding, options) { + var codec = iconv.getCodec(encoding), + encoder = new codec.encoder(options, codec); + + if (codec.bomAware && options && options.addBOM) + encoder = new bomHandling.PrependBOM(encoder, options); + + return encoder; +} + +iconv.getDecoder = function getDecoder(encoding, options) { + var codec = iconv.getCodec(encoding), + decoder = new codec.decoder(options, codec); + + if (codec.bomAware && !(options && options.stripBOM === false)) + decoder = new bomHandling.StripBOM(decoder, options); + + return decoder; +} + + +// Load extensions in Node. All of them are omitted in Browserify build via 'browser' field in package.json. +var nodeVer = typeof process !== 'undefined' && process.versions && process.versions.node; +if (nodeVer) { + + // Load streaming support in Node v0.10+ + var nodeVerArr = nodeVer.split(".").map(Number); + if (nodeVerArr[0] > 0 || nodeVerArr[1] >= 10) { + require("./streams")(iconv); + } + + // Load Node primitive extensions. + require("./extend-node")(iconv); +} + +if ("Ā" != "\u0100") { + console.error("iconv-lite warning: javascript files use encoding different from utf-8. See https://github.com/ashtuchkin/iconv-lite/wiki/Javascript-source-file-encodings for more info."); +} diff --git a/nodejs/node_modules/iconv-lite/lib/streams.js b/nodejs/node_modules/iconv-lite/lib/streams.js new file mode 100644 index 000000000..440955295 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/lib/streams.js @@ -0,0 +1,121 @@ +"use strict"; + +var Buffer = require("buffer").Buffer, + Transform = require("stream").Transform; + + +// == Exports ================================================================== +module.exports = function(iconv) { + + // Additional Public API. + iconv.encodeStream = function encodeStream(encoding, options) { + return new IconvLiteEncoderStream(iconv.getEncoder(encoding, options), options); + } + + iconv.decodeStream = function decodeStream(encoding, options) { + return new IconvLiteDecoderStream(iconv.getDecoder(encoding, options), options); + } + + iconv.supportsStreams = true; + + + // Not published yet. + iconv.IconvLiteEncoderStream = IconvLiteEncoderStream; + iconv.IconvLiteDecoderStream = IconvLiteDecoderStream; + iconv._collect = IconvLiteDecoderStream.prototype.collect; +}; + + +// == Encoder stream ======================================================= +function IconvLiteEncoderStream(conv, options) { + this.conv = conv; + options = options || {}; + options.decodeStrings = false; // We accept only strings, so we don't need to decode them. + Transform.call(this, options); +} + +IconvLiteEncoderStream.prototype = Object.create(Transform.prototype, { + constructor: { value: IconvLiteEncoderStream } +}); + +IconvLiteEncoderStream.prototype._transform = function(chunk, encoding, done) { + if (typeof chunk != 'string') + return done(new Error("Iconv encoding stream needs strings as its input.")); + try { + var res = this.conv.write(chunk); + if (res && res.length) this.push(res); + done(); + } + catch (e) { + done(e); + } +} + +IconvLiteEncoderStream.prototype._flush = function(done) { + try { + var res = this.conv.end(); + if (res && res.length) this.push(res); + done(); + } + catch (e) { + done(e); + } +} + +IconvLiteEncoderStream.prototype.collect = function(cb) { + var chunks = []; + this.on('error', cb); + this.on('data', function(chunk) { chunks.push(chunk); }); + this.on('end', function() { + cb(null, Buffer.concat(chunks)); + }); + return this; +} + + +// == Decoder stream ======================================================= +function IconvLiteDecoderStream(conv, options) { + this.conv = conv; + options = options || {}; + options.encoding = this.encoding = 'utf8'; // We output strings. + Transform.call(this, options); +} + +IconvLiteDecoderStream.prototype = Object.create(Transform.prototype, { + constructor: { value: IconvLiteDecoderStream } +}); + +IconvLiteDecoderStream.prototype._transform = function(chunk, encoding, done) { + if (!Buffer.isBuffer(chunk)) + return done(new Error("Iconv decoding stream needs buffers as its input.")); + try { + var res = this.conv.write(chunk); + if (res && res.length) this.push(res, this.encoding); + done(); + } + catch (e) { + done(e); + } +} + +IconvLiteDecoderStream.prototype._flush = function(done) { + try { + var res = this.conv.end(); + if (res && res.length) this.push(res, this.encoding); + done(); + } + catch (e) { + done(e); + } +} + +IconvLiteDecoderStream.prototype.collect = function(cb) { + var res = ''; + this.on('error', cb); + this.on('data', function(chunk) { res += chunk; }); + this.on('end', function() { + cb(null, res); + }); + return this; +} + diff --git a/nodejs/node_modules/iconv-lite/package.json b/nodejs/node_modules/iconv-lite/package.json new file mode 100644 index 000000000..29718f958 --- /dev/null +++ b/nodejs/node_modules/iconv-lite/package.json @@ -0,0 +1,127 @@ +{ + "_args": [ + [ + "iconv-lite@0.4.19", + "/Users/muammar/github/mkchromecast/nodejs" + ] + ], + "_from": "iconv-lite@0.4.19", + "_id": "iconv-lite@0.4.19", + "_inBundle": false, + "_integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "_location": "/iconv-lite", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "iconv-lite@0.4.19", + "name": "iconv-lite", + "escapedName": "iconv-lite", + "rawSpec": "0.4.19", + "saveSpec": null, + "fetchSpec": "0.4.19" + }, + "_requiredBy": [ + "/body-parser", + "/raw-body" + ], + "_resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "_spec": "0.4.19", + "_where": "/Users/muammar/github/mkchromecast/nodejs", + "author": { + "name": "Alexander Shtuchkin", + "email": "ashtuchkin@gmail.com" + }, + "browser": { + "./extend-node": false, + "./streams": false + }, + "bugs": { + "url": "https://github.com/ashtuchkin/iconv-lite/issues" + }, + "contributors": [ + { + "name": "Jinwu Zhan", + "url": "https://github.com/jenkinv" + }, + { + "name": "Adamansky Anton", + "url": "https://github.com/adamansky" + }, + { + "name": "George Stagas", + "url": "https://github.com/stagas" + }, + { + "name": "Mike D Pilsbury", + "url": "https://github.com/pekim" + }, + { + "name": "Niggler", + "url": "https://github.com/Niggler" + }, + { + "name": "wychi", + "url": "https://github.com/wychi" + }, + { + "name": "David Kuo", + "url": "https://github.com/david50407" + }, + { + "name": "ChangZhuo Chen", + "url": "https://github.com/czchen" + }, + { + "name": "Lee Treveil", + "url": "https://github.com/leetreveil" + }, + { + "name": "Brian White", + "url": "https://github.com/mscdex" + }, + { + "name": "Mithgol", + "url": "https://github.com/Mithgol" + }, + { + "name": "Nazar Leush", + "url": "https://github.com/nleush" + } + ], + "description": "Convert character encodings in pure javascript.", + "devDependencies": { + "async": "*", + "errto": "*", + "iconv": "*", + "istanbul": "*", + "mocha": "*", + "request": "*", + "semver": "*", + "unorm": "*" + }, + "engines": { + "node": ">=0.10.0" + }, + "homepage": "https://github.com/ashtuchkin/iconv-lite", + "keywords": [ + "iconv", + "convert", + "charset", + "icu" + ], + "license": "MIT", + "main": "./lib/index.js", + "name": "iconv-lite", + "repository": { + "type": "git", + "url": "git://github.com/ashtuchkin/iconv-lite.git" + }, + "scripts": { + "coverage": "istanbul cover _mocha -- --grep .", + "coverage-open": "open coverage/lcov-report/index.html", + "test": "mocha --reporter spec --grep ." + }, + "typings": "./lib/index.d.ts", + "version": "0.4.19" +} diff --git a/nodejs/node_modules/inherits/package.json b/nodejs/node_modules/inherits/package.json index 72c875fa5..66eccb251 100644 --- a/nodejs/node_modules/inherits/package.json +++ b/nodejs/node_modules/inherits/package.json @@ -1,70 +1,45 @@ { "_args": [ [ - { - "raw": "inherits@2.0.3", - "scope": null, - "escapedName": "inherits", - "name": "inherits", - "rawSpec": "2.0.3", - "spec": "2.0.3", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/http-errors" + "inherits@2.0.3", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "inherits@2.0.3", "_id": "inherits@2.0.3", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "_location": "/inherits", - "_nodeVersion": "6.5.0", - "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/inherits-2.0.3.tgz_1473295776489_0.08142363070510328" - }, - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" - }, - "_npmVersion": "3.10.7", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "inherits@2.0.3", - "scope": null, - "escapedName": "inherits", "name": "inherits", + "escapedName": "inherits", "rawSpec": "2.0.3", - "spec": "2.0.3", - "type": "version" + "saveSpec": null, + "fetchSpec": "2.0.3" }, "_requiredBy": [ "/http-errors", "/readable-stream" ], "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "_shasum": "633c2c83e3da42a502f52466022480f4208261de", - "_shrinkwrap": null, - "_spec": "inherits@2.0.3", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/http-errors", + "_spec": "2.0.3", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "browser": "./inherits_browser.js", "bugs": { "url": "https://github.com/isaacs/inherits/issues" }, - "dependencies": {}, "description": "Browser-friendly inheritance fully compatible with standard node.js inherits()", "devDependencies": { "tap": "^7.1.0" }, - "directories": {}, - "dist": { - "shasum": "633c2c83e3da42a502f52466022480f4208261de", - "tarball": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" - }, "files": [ "inherits.js", "inherits_browser.js" ], - "gitHead": "e05d0fb27c61a3ec687214f0476386b765364d5f", "homepage": "https://github.com/isaacs/inherits#readme", "keywords": [ "inheritance", @@ -78,15 +53,7 @@ ], "license": "ISC", "main": "./inherits.js", - "maintainers": [ - { - "name": "isaacs", - "email": "i@izs.me" - } - ], "name": "inherits", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/isaacs/inherits.git" diff --git a/nodejs/node_modules/ipaddr.js/Cakefile b/nodejs/node_modules/ipaddr.js/Cakefile index 7fd355a7b..a6de48f76 100644 --- a/nodejs/node_modules/ipaddr.js/Cakefile +++ b/nodejs/node_modules/ipaddr.js/Cakefile @@ -4,7 +4,7 @@ nodeunit = require 'nodeunit' UglifyJS = require 'uglify-js' task 'build', 'build the JavaScript files from CoffeeScript source', build = (cb) -> - source = fs.readFileSync 'src/ipaddr.coffee' + source = fs.readFileSync 'src/ipaddr.coffee', 'utf-8' fs.writeFileSync 'lib/ipaddr.js', CoffeeScript.compile source.toString() invoke 'test' @@ -14,5 +14,5 @@ task 'test', 'run the bundled tests', (cb) -> nodeunit.reporters.default.run ['test'] task 'compress', 'uglify the resulting javascript', (cb) -> - result = UglifyJS.minify('lib/ipaddr.js') - fs.writeFileSync('ipaddr.min.js', result.code) + source = fs.readFileSync 'lib/ipaddr.js', 'utf-8' + fs.writeFileSync('ipaddr.min.js', UglifyJS.minify(source).code) diff --git a/nodejs/node_modules/ipaddr.js/LICENSE b/nodejs/node_modules/ipaddr.js/LICENSE index 3493f0dfc..f6b37b52d 100644 --- a/nodejs/node_modules/ipaddr.js/LICENSE +++ b/nodejs/node_modules/ipaddr.js/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2011 Peter Zotov +Copyright (C) 2011-2017 whitequark Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -16,4 +16,4 @@ 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. \ No newline at end of file +THE SOFTWARE. diff --git a/nodejs/node_modules/ipaddr.js/README.md b/nodejs/node_modules/ipaddr.js/README.md index 1d2b42dc8..6876a3b82 100644 --- a/nodejs/node_modules/ipaddr.js/README.md +++ b/nodejs/node_modules/ipaddr.js/README.md @@ -43,7 +43,7 @@ or throws an `Error` if the passed string is not a valid representation of an IP address. The `ipaddr.process` method works just like the `ipaddr.parse` one, but it -automatically converts IPv4-mapped IPv6 addresses to their IPv4 couterparts +automatically converts IPv4-mapped IPv6 addresses to their IPv4 counterparts before returning. It is useful when you have a Node.js instance listening on an IPv6 socket, and the `net.ivp6.bindv6only` sysctl parameter (or its equivalent on non-Linux OS) is set to 0. In this case, you can accept IPv4 @@ -97,8 +97,7 @@ in the source: [IPv6 ranges] and [IPv4 ranges]. Some common ones include `"unica (the default one) and `"reserved"`. You can match against your own range list by using -`ipaddr.subnetMatch(address, rangeList, defaultName)` method. It can work with both -IPv6 and IPv4 addresses, and accepts a name-to-subnet map as the range list. For example: +`ipaddr.subnetMatch(address, rangeList, defaultName)` method. It can work with a mix of IPv6 or IPv4 addresses, and accepts a name-to-subnet map as the range list. For example: ```js var rangeList = { @@ -108,7 +107,7 @@ var rangeList = { [ ipaddr.parse('2001:5c0::'), 32 ] // freenet6 ] }; -ipaddr.subnetMatch(ipaddr.parse('2001:470:8:66::1'), rangeList, 'unknown'); // => "he.net" +ipaddr.subnetMatch(ipaddr.parse('2001:470:8:66::1'), rangeList, 'unknown'); // => "tunnelProviders" ``` The addresses can be converted to their byte representation with `toByteArray()`. @@ -155,6 +154,13 @@ var addr = ipaddr.parse("2001:db8:10::1234:DEAD"); addr.parts // => [0x2001, 0xdb8, 0x10, 0, 0, 0, 0x1234, 0xdead] ``` +A IPv6 zone index can be accessed via `addr.zoneId`: + +```js +var addr = ipaddr.parse("2001:db8::%eth0"); +addr.zoneId // => 'eth0' +``` + #### IPv4 properties `toIPv4MappedAddress()` will return a corresponding IPv4-mapped IPv6 address. @@ -174,6 +180,22 @@ ipaddr.IPv4.parse('255.255.255.240').prefixLengthFromSubnetMask() == 28 ipaddr.IPv4.parse('255.192.164.0').prefixLengthFromSubnetMask() == null ``` +`subnetMaskFromPrefixLength()` will return an IPv4 netmask for a valid CIDR prefix length. + +```js +ipaddr.IPv4.subnetMaskFromPrefixLength(24) == "255.255.255.0" +ipaddr.IPv4.subnetMaskFromPrefixLength(29) == "255.255.255.248" +``` + +`broadcastAddressFromCIDR()` will return the broadcast address for a given IPv4 interface and netmask in CIDR notation. +```js +ipaddr.IPv4.broadcastAddressFromCIDR("172.0.0.1/24") == "172.0.0.255" +``` +`networkAddressFromCIDR()` will return the network address for a given IPv4 interface and netmask in CIDR notation. +```js +ipaddr.IPv4.networkAddressFromCIDR("172.0.0.1/24") == "172.0.0.0" +``` + #### Conversion IPv4 and IPv6 can be converted bidirectionally to and from network byte order (MSB) byte arrays. diff --git a/nodejs/node_modules/ipaddr.js/bower.json b/nodejs/node_modules/ipaddr.js/bower.json index 2f5093e95..96e98cdb6 100644 --- a/nodejs/node_modules/ipaddr.js/bower.json +++ b/nodejs/node_modules/ipaddr.js/bower.json @@ -1,6 +1,6 @@ { "name": "ipaddr.js", - "version": "1.3.0", + "version": "1.5.2", "homepage": "https://github.com/whitequark/ipaddr.js", "authors": [ "whitequark " diff --git a/nodejs/node_modules/ipaddr.js/ipaddr.min.js b/nodejs/node_modules/ipaddr.js/ipaddr.min.js index d90a4804a..52f9138a9 100644 --- a/nodejs/node_modules/ipaddr.js/ipaddr.min.js +++ b/nodejs/node_modules/ipaddr.js/ipaddr.min.js @@ -1 +1 @@ -(function(){var r,t,n,e,i,o,a,s;t={},s=this,"undefined"!=typeof module&&null!==module&&module.exports?module.exports=t:s.ipaddr=t,a=function(r,t,n,e){var i,o;if(r.length!==t.length)throw new Error("ipaddr: cannot match CIDR for objects with different lengths");for(i=0;e>0;){if(o=n-e,o<0&&(o=0),r[i]>>o!=t[i]>>o)return!1;e-=n,i+=1}return!0},t.subnetMatch=function(r,t,n){var e,i,o,a,s;null==n&&(n="unicast");for(e in t)for(i=t[e],!i[0]||i[0]instanceof Array||(i=[i]),a=0,s=i.length;a=0;t=a+=-1){if(!((n=this.octets[t])in o))return null;if(i=o[n],e&&0!==i)return null;8!==i&&(e=!0),r+=i}return 32-r},r}(),n="(0?\\d+|0x[a-f0-9]+)",e={fourOctet:new RegExp("^"+n+"\\."+n+"\\."+n+"\\."+n+"$","i"),longValue:new RegExp("^"+n+"$","i")},t.IPv4.parser=function(r){var t,n,i,o,a;if(n=function(r){return"0"===r[0]&&"x"!==r[1]?parseInt(r,8):parseInt(r)},t=r.match(e.fourOctet))return function(){var r,e,o,a;for(o=t.slice(1,6),a=[],r=0,e=o.length;r4294967295||a<0)throw new Error("ipaddr: address outside defined range");return function(){var r,t;for(t=[],o=r=0;r<=24;o=r+=8)t.push(a>>o&255);return t}().reverse()}return null},t.IPv6=function(){function r(r){var t,n,e,i,o,a;if(16===r.length)for(this.parts=[],t=e=0;e<=14;t=e+=2)this.parts.push(r[t]<<8|r[t+1]);else{if(8!==r.length)throw new Error("ipaddr: ipv6 part count should be 8 or 16");this.parts=r}for(a=this.parts,i=0,o=a.length;i>8),r.push(255&t);return r},r.prototype.toNormalizedString=function(){var r;return function(){var t,n,e,i;for(e=this.parts,i=[],t=0,n=e.length;t>8,255&r,n>>8,255&n])},r}(),i="(?:[0-9a-f]+::?)+",o={native:new RegExp("^(::)?("+i+")?([0-9a-f]+)?(::)?$","i"),transitional:new RegExp("^((?:"+i+")|(?:::)(?:"+i+")?)"+n+"\\."+n+"\\."+n+"\\."+n+"$","i")},r=function(r,t){var n,e,i,o,a;if(r.indexOf("::")!==r.lastIndexOf("::"))return null;for(n=0,e=-1;(e=r.indexOf(":",e+1))>=0;)n++;if("::"===r.substr(0,2)&&n--,"::"===r.substr(-2,2)&&n--,n>t)return null;for(a=t-n,o=":";a--;)o+="0:";return r=r.replace("::",o),":"===r[0]&&(r=r.slice(1)),":"===r[r.length-1]&&(r=r.slice(0,-1)),function(){var t,n,e,o;for(e=r.split(":"),o=[],t=0,n=e.length;t=0&&t<=32)return[this.parse(n[1]),t];throw new Error("ipaddr: string is not formatted like an IPv4 CIDR range")},t.IPv6.parseCIDR=function(r){var t,n;if((n=r.match(/^(.+)\/(\d+)$/))&&(t=parseInt(n[2]))>=0&&t<=128)return[this.parse(n[1]),t];throw new Error("ipaddr: string is not formatted like an IPv6 CIDR range")},t.isValid=function(r){return t.IPv6.isValid(r)||t.IPv4.isValid(r)},t.parse=function(r){if(t.IPv6.isValid(r))return t.IPv6.parse(r);if(t.IPv4.isValid(r))return t.IPv4.parse(r);throw new Error("ipaddr: the address has neither IPv6 nor IPv4 format")},t.parseCIDR=function(r){try{return t.IPv6.parseCIDR(r)}catch(n){n;try{return t.IPv4.parseCIDR(r)}catch(r){throw r,new Error("ipaddr: the address has neither IPv6 nor IPv4 CIDR format")}}},t.fromByteArray=function(r){var n;if(4===(n=r.length))return new t.IPv4(r);if(16===n)return new t.IPv6(r);throw new Error("ipaddr: the binary input is neither an IPv6 nor IPv4 address")},t.process=function(r){var t;return t=this.parse(r),"ipv6"===t.kind()&&t.isIPv4MappedAddress()?t.toIPv4Address():t}}).call(this); \ No newline at end of file +(function(){var r,t,n,e,i,o,a,s;t={},s=this,"undefined"!=typeof module&&null!==module&&module.exports?module.exports=t:s.ipaddr=t,a=function(r,t,n,e){var i,o;if(r.length!==t.length)throw new Error("ipaddr: cannot match CIDR for objects with different lengths");for(i=0;e>0;){if((o=n-e)<0&&(o=0),r[i]>>o!=t[i]>>o)return!1;e-=n,i+=1}return!0},t.subnetMatch=function(r,t,n){var e,i,o,a,s;null==n&&(n="unicast");for(o in t)for(!(a=t[o])[0]||a[0]instanceof Array||(a=[a]),e=0,i=a.length;e=0;t=n+=-1){if(!((e=this.octets[t])in a))return null;if(o=a[e],i&&0!==o)return null;8!==o&&(i=!0),r+=o}return 32-r},r}(),n="(0?\\d+|0x[a-f0-9]+)",e={fourOctet:new RegExp("^"+n+"\\."+n+"\\."+n+"\\."+n+"$","i"),longValue:new RegExp("^"+n+"$","i")},t.IPv4.parser=function(r){var t,n,i,o,a;if(n=function(r){return"0"===r[0]&&"x"!==r[1]?parseInt(r,8):parseInt(r)},t=r.match(e.fourOctet))return function(){var r,e,o,a;for(a=[],r=0,e=(o=t.slice(1,6)).length;r4294967295||a<0)throw new Error("ipaddr: address outside defined range");return function(){var r,t;for(t=[],o=r=0;r<=24;o=r+=8)t.push(a>>o&255);return t}().reverse()}return null},t.IPv6=function(){function r(r,t){var n,e,i,o,a,s;if(16===r.length)for(this.parts=[],n=e=0;e<=14;n=e+=2)this.parts.push(r[n]<<8|r[n+1]);else{if(8!==r.length)throw new Error("ipaddr: ipv6 part count should be 8 or 16");this.parts=r}for(i=0,o=(s=this.parts).length;i>8),r.push(255&e);return r},r.prototype.toNormalizedString=function(){var r,t,n;return r=function(){var r,n,e,i;for(i=[],r=0,n=(e=this.parts).length;r>8,255&r,n>>8,255&n])},r.prototype.prefixLengthFromSubnetMask=function(){var r,t,n,e,i,o,a;for(a={0:16,32768:15,49152:14,57344:13,61440:12,63488:11,64512:10,65024:9,65280:8,65408:7,65472:6,65504:5,65520:4,65528:3,65532:2,65534:1,65535:0},r=0,i=!1,t=n=7;n>=0;t=n+=-1){if(!((e=this.parts[t])in a))return null;if(o=a[e],i&&0!==o)return null;16!==o&&(i=!0),r+=o}return 128-r},r}(),i="(?:[0-9a-f]+::?)+",o={zoneIndex:new RegExp("%[0-9a-z]{1,}","i"),native:new RegExp("^(::)?("+i+")?([0-9a-f]+)?(::)?(%[0-9a-z]{1,})?$","i"),transitional:new RegExp("^((?:"+i+")|(?:::)(?:"+i+")?)"+n+"\\."+n+"\\."+n+"\\."+n+"(%[0-9a-z]{1,})?$","i")},r=function(r,t){var n,e,i,a,s,p;if(r.indexOf("::")!==r.lastIndexOf("::"))return null;for((p=(r.match(o.zoneIndex)||[])[0])&&(p=p.substring(1),r=r.replace(/%.+$/,"")),n=0,e=-1;(e=r.indexOf(":",e+1))>=0;)n++;if("::"===r.substr(0,2)&&n--,"::"===r.substr(-2,2)&&n--,n>t)return null;for(s=t-n,a=":";s--;)a+="0:";return":"===(r=r.replace("::",a))[0]&&(r=r.slice(1)),":"===r[r.length-1]&&(r=r.slice(0,-1)),t=function(){var t,n,e,o;for(o=[],t=0,n=(e=r.split(":")).length;t=0&&t<=32)return[this.parse(n[1]),t];throw new Error("ipaddr: string is not formatted like an IPv4 CIDR range")},t.IPv4.subnetMaskFromPrefixLength=function(r){var t,n,e;if((r=parseInt(r))<0||r>32)throw new Error("ipaddr: invalid IPv4 prefix length");for(e=[0,0,0,0],n=0,t=Math.floor(r/8);n=0&&t<=128)return[this.parse(n[1]),t];throw new Error("ipaddr: string is not formatted like an IPv6 CIDR range")},t.isValid=function(r){return t.IPv6.isValid(r)||t.IPv4.isValid(r)},t.parse=function(r){if(t.IPv6.isValid(r))return t.IPv6.parse(r);if(t.IPv4.isValid(r))return t.IPv4.parse(r);throw new Error("ipaddr: the address has neither IPv6 nor IPv4 format")},t.parseCIDR=function(r){try{return t.IPv6.parseCIDR(r)}catch(n){n;try{return t.IPv4.parseCIDR(r)}catch(r){throw r,new Error("ipaddr: the address has neither IPv6 nor IPv4 CIDR format")}}},t.fromByteArray=function(r){var n;if(4===(n=r.length))return new t.IPv4(r);if(16===n)return new t.IPv6(r);throw new Error("ipaddr: the binary input is neither an IPv6 nor IPv4 address")},t.process=function(r){var t;return"ipv6"===(t=this.parse(r)).kind()&&t.isIPv4MappedAddress()?t.toIPv4Address():t}}).call(this); \ No newline at end of file diff --git a/nodejs/node_modules/ipaddr.js/lib/ipaddr.js b/nodejs/node_modules/ipaddr.js/lib/ipaddr.js index 8bef4077a..360230bac 100644 --- a/nodejs/node_modules/ipaddr.js/lib/ipaddr.js +++ b/nodejs/node_modules/ipaddr.js/lib/ipaddr.js @@ -1,5 +1,5 @@ (function() { - var expandIPv6, ipaddr, ipv4Part, ipv4Regexes, ipv6Part, ipv6Regexes, matchCIDR, root; + var expandIPv6, ipaddr, ipv4Part, ipv4Regexes, ipv6Part, ipv6Regexes, matchCIDR, root, zoneIndex; ipaddr = {}; @@ -32,7 +32,7 @@ }; ipaddr.subnetMatch = function(address, rangeList, defaultName) { - var rangeName, rangeSubnets, subnet, _i, _len; + var k, len, rangeName, rangeSubnets, subnet; if (defaultName == null) { defaultName = 'unicast'; } @@ -41,10 +41,12 @@ if (rangeSubnets[0] && !(rangeSubnets[0] instanceof Array)) { rangeSubnets = [rangeSubnets]; } - for (_i = 0, _len = rangeSubnets.length; _i < _len; _i++) { - subnet = rangeSubnets[_i]; - if (address.match.apply(address, subnet)) { - return rangeName; + for (k = 0, len = rangeSubnets.length; k < len; k++) { + subnet = rangeSubnets[k]; + if (address.kind() === subnet[0].kind()) { + if (address.match.apply(address, subnet)) { + return rangeName; + } } } } @@ -53,12 +55,12 @@ ipaddr.IPv4 = (function() { function IPv4(octets) { - var octet, _i, _len; + var k, len, octet; if (octets.length !== 4) { throw new Error("ipaddr: ipv4 octet count should be 4"); } - for (_i = 0, _len = octets.length; _i < _len; _i++) { - octet = octets[_i]; + for (k = 0, len = octets.length; k < len; k++) { + octet = octets[k]; if (!((0 <= octet && octet <= 255))) { throw new Error("ipaddr: ipv4 octet should fit in 8 bits"); } @@ -74,14 +76,18 @@ return this.octets.join("."); }; + IPv4.prototype.toNormalizedString = function() { + return this.toString(); + }; + IPv4.prototype.toByteArray = function() { return this.octets.slice(0); }; IPv4.prototype.match = function(other, cidrRange) { - var _ref; + var ref; if (cidrRange === void 0) { - _ref = other, other = _ref[0], cidrRange = _ref[1]; + ref = other, other = ref[0], cidrRange = ref[1]; } if (other.kind() !== 'ipv4') { throw new Error("ipaddr: cannot match ipv4 address with non-ipv4 one"); @@ -109,7 +115,7 @@ }; IPv4.prototype.prefixLengthFromSubnetMask = function() { - var cidr, i, octet, stop, zeros, zerotable, _i; + var cidr, i, k, octet, stop, zeros, zerotable; zerotable = { 0: 8, 128: 7, @@ -123,7 +129,7 @@ }; cidr = 0; stop = false; - for (i = _i = 3; _i >= 0; i = _i += -1) { + for (i = k = 3; k >= 0; i = k += -1) { octet = this.octets[i]; if (octet in zerotable) { zeros = zerotable[octet]; @@ -163,14 +169,14 @@ }; if (match = string.match(ipv4Regexes.fourOctet)) { return (function() { - var _i, _len, _ref, _results; - _ref = match.slice(1, 6); - _results = []; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - part = _ref[_i]; - _results.push(parseIntAuto(part)); + var k, len, ref, results; + ref = match.slice(1, 6); + results = []; + for (k = 0, len = ref.length; k < len; k++) { + part = ref[k]; + results.push(parseIntAuto(part)); } - return _results; + return results; })(); } else if (match = string.match(ipv4Regexes.longValue)) { value = parseIntAuto(match[1]); @@ -178,12 +184,12 @@ throw new Error("ipaddr: address outside defined range"); } return ((function() { - var _i, _results; - _results = []; - for (shift = _i = 0; _i <= 24; shift = _i += 8) { - _results.push((value >> shift) & 0xff); + var k, results; + results = []; + for (shift = k = 0; k <= 24; shift = k += 8) { + results.push((value >> shift) & 0xff); } - return _results; + return results; })()).reverse(); } else { return null; @@ -191,11 +197,11 @@ }; ipaddr.IPv6 = (function() { - function IPv6(parts) { - var i, part, _i, _j, _len, _ref; + function IPv6(parts, zoneId) { + var i, k, l, len, part, ref; if (parts.length === 16) { this.parts = []; - for (i = _i = 0; _i <= 14; i = _i += 2) { + for (i = k = 0; k <= 14; i = k += 2) { this.parts.push((parts[i] << 8) | parts[i + 1]); } } else if (parts.length === 8) { @@ -203,13 +209,16 @@ } else { throw new Error("ipaddr: ipv6 part count should be 8 or 16"); } - _ref = this.parts; - for (_j = 0, _len = _ref.length; _j < _len; _j++) { - part = _ref[_j]; + ref = this.parts; + for (l = 0, len = ref.length; l < len; l++) { + part = ref[l]; if (!((0 <= part && part <= 0xffff))) { throw new Error("ipaddr: ipv6 part should fit in 16 bits"); } } + if (zoneId) { + this.zoneId = zoneId; + } } IPv6.prototype.kind = function() { @@ -217,24 +226,24 @@ }; IPv6.prototype.toString = function() { - var compactStringParts, part, pushPart, state, stringParts, _i, _len; + var addr, compactStringParts, k, len, part, pushPart, state, stringParts, suffix; stringParts = (function() { - var _i, _len, _ref, _results; - _ref = this.parts; - _results = []; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - part = _ref[_i]; - _results.push(part.toString(16)); + var k, len, ref, results; + ref = this.parts; + results = []; + for (k = 0, len = ref.length; k < len; k++) { + part = ref[k]; + results.push(part.toString(16)); } - return _results; + return results; }).call(this); compactStringParts = []; pushPart = function(part) { return compactStringParts.push(part); }; state = 0; - for (_i = 0, _len = stringParts.length; _i < _len; _i++) { - part = stringParts[_i]; + for (k = 0, len = stringParts.length; k < len; k++) { + part = stringParts[k]; switch (state) { case 0: if (part === '0') { @@ -266,15 +275,20 @@ pushPart(''); pushPart(''); } - return compactStringParts.join(":"); + addr = compactStringParts.join(":"); + suffix = ''; + if (this.zoneId) { + suffix = '%' + this.zoneId; + } + return addr + suffix; }; IPv6.prototype.toByteArray = function() { - var bytes, part, _i, _len, _ref; + var bytes, k, len, part, ref; bytes = []; - _ref = this.parts; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - part = _ref[_i]; + ref = this.parts; + for (k = 0, len = ref.length; k < len; k++) { + part = ref[k]; bytes.push(part >> 8); bytes.push(part & 0xff); } @@ -282,23 +296,28 @@ }; IPv6.prototype.toNormalizedString = function() { - var part; - return ((function() { - var _i, _len, _ref, _results; - _ref = this.parts; - _results = []; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - part = _ref[_i]; - _results.push(part.toString(16)); + var addr, part, suffix; + addr = ((function() { + var k, len, ref, results; + ref = this.parts; + results = []; + for (k = 0, len = ref.length; k < len; k++) { + part = ref[k]; + results.push(part.toString(16)); } - return _results; + return results; }).call(this)).join(":"); + suffix = ''; + if (this.zoneId) { + suffix = '%' + this.zoneId; + } + return addr + suffix; }; IPv6.prototype.match = function(other, cidrRange) { - var _ref; + var ref; if (cidrRange === void 0) { - _ref = other, other = _ref[0], cidrRange = _ref[1]; + ref = other, other = ref[0], cidrRange = ref[1]; } if (other.kind() !== 'ipv6') { throw new Error("ipaddr: cannot match ipv6 address with non-ipv6 one"); @@ -329,30 +348,79 @@ }; IPv6.prototype.toIPv4Address = function() { - var high, low, _ref; + var high, low, ref; if (!this.isIPv4MappedAddress()) { throw new Error("ipaddr: trying to convert a generic ipv6 address to ipv4"); } - _ref = this.parts.slice(-2), high = _ref[0], low = _ref[1]; + ref = this.parts.slice(-2), high = ref[0], low = ref[1]; return new ipaddr.IPv4([high >> 8, high & 0xff, low >> 8, low & 0xff]); }; + IPv6.prototype.prefixLengthFromSubnetMask = function() { + var cidr, i, k, part, stop, zeros, zerotable; + zerotable = { + 0: 16, + 32768: 15, + 49152: 14, + 57344: 13, + 61440: 12, + 63488: 11, + 64512: 10, + 65024: 9, + 65280: 8, + 65408: 7, + 65472: 6, + 65504: 5, + 65520: 4, + 65528: 3, + 65532: 2, + 65534: 1, + 65535: 0 + }; + cidr = 0; + stop = false; + for (i = k = 7; k >= 0; i = k += -1) { + part = this.parts[i]; + if (part in zerotable) { + zeros = zerotable[part]; + if (stop && zeros !== 0) { + return null; + } + if (zeros !== 16) { + stop = true; + } + cidr += zeros; + } else { + return null; + } + } + return 128 - cidr; + }; + return IPv6; })(); ipv6Part = "(?:[0-9a-f]+::?)+"; + zoneIndex = "%[0-9a-z]{1,}"; + ipv6Regexes = { - "native": new RegExp("^(::)?(" + ipv6Part + ")?([0-9a-f]+)?(::)?$", 'i'), - transitional: new RegExp(("^((?:" + ipv6Part + ")|(?:::)(?:" + ipv6Part + ")?)") + ("" + ipv4Part + "\\." + ipv4Part + "\\." + ipv4Part + "\\." + ipv4Part + "$"), 'i') + zoneIndex: new RegExp(zoneIndex, 'i'), + "native": new RegExp("^(::)?(" + ipv6Part + ")?([0-9a-f]+)?(::)?(" + zoneIndex + ")?$", 'i'), + transitional: new RegExp(("^((?:" + ipv6Part + ")|(?:::)(?:" + ipv6Part + ")?)") + (ipv4Part + "\\." + ipv4Part + "\\." + ipv4Part + "\\." + ipv4Part) + ("(" + zoneIndex + ")?$"), 'i') }; expandIPv6 = function(string, parts) { - var colonCount, lastColon, part, replacement, replacementCount; + var colonCount, lastColon, part, replacement, replacementCount, zoneId; if (string.indexOf('::') !== string.lastIndexOf('::')) { return null; } + zoneId = (string.match(ipv6Regexes['zoneIndex']) || [])[0]; + if (zoneId) { + zoneId = zoneId.substring(1); + string = string.replace(/%.+$/, ''); + } colonCount = 0; lastColon = -1; while ((lastColon = string.indexOf(':', lastColon + 1)) >= 0) { @@ -379,35 +447,43 @@ if (string[string.length - 1] === ':') { string = string.slice(0, -1); } - return (function() { - var _i, _len, _ref, _results; - _ref = string.split(":"); - _results = []; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - part = _ref[_i]; - _results.push(parseInt(part, 16)); + parts = (function() { + var k, len, ref, results; + ref = string.split(":"); + results = []; + for (k = 0, len = ref.length; k < len; k++) { + part = ref[k]; + results.push(parseInt(part, 16)); } - return _results; + return results; })(); + return { + parts: parts, + zoneId: zoneId + }; }; ipaddr.IPv6.parser = function(string) { - var match, octet, octets, parts, _i, _len; - if (string.match(ipv6Regexes['native'])) { + var addr, k, len, match, octet, octets, zoneId; + if (ipv6Regexes['native'].test(string)) { return expandIPv6(string, 8); } else if (match = string.match(ipv6Regexes['transitional'])) { - parts = expandIPv6(match[1].slice(0, -1), 6); - if (parts) { + zoneId = match[6] || ''; + addr = expandIPv6(match[1].slice(0, -1) + zoneId, 6); + if (addr.parts) { octets = [parseInt(match[2]), parseInt(match[3]), parseInt(match[4]), parseInt(match[5])]; - for (_i = 0, _len = octets.length; _i < _len; _i++) { - octet = octets[_i]; + for (k = 0, len = octets.length; k < len; k++) { + octet = octets[k]; if (!((0 <= octet && octet <= 255))) { return null; } } - parts.push(octets[0] << 8 | octets[1]); - parts.push(octets[2] << 8 | octets[3]); - return parts; + addr.parts.push(octets[0] << 8 | octets[1]); + addr.parts.push(octets[2] << 8 | octets[3]); + return { + parts: addr.parts, + zoneId: addr.zoneId + }; } } return null; @@ -422,8 +498,8 @@ try { new this(this.parser(string)); return true; - } catch (_error) { - e = _error; + } catch (error1) { + e = error1; return false; } }; @@ -437,20 +513,21 @@ }; ipaddr.IPv6.isValid = function(string) { - var e; + var addr, e; if (typeof string === "string" && string.indexOf(":") === -1) { return false; } try { - new this(this.parser(string)); + addr = this.parser(string); + new this(addr.parts, addr.zoneId); return true; - } catch (_error) { - e = _error; + } catch (error1) { + e = error1; return false; } }; - ipaddr.IPv4.parse = ipaddr.IPv6.parse = function(string) { + ipaddr.IPv4.parse = function(string) { var parts; parts = this.parser(string); if (parts === null) { @@ -459,6 +536,15 @@ return new this(parts); }; + ipaddr.IPv6.parse = function(string) { + var addr; + addr = this.parser(string); + if (addr.parts === null) { + throw new Error("ipaddr: string is not formatted like ip address"); + } + return new this(addr.parts, addr.zoneId); + }; + ipaddr.IPv4.parseCIDR = function(string) { var maskLength, match; if (match = string.match(/^(.+)\/(\d+)$/)) { @@ -470,6 +556,63 @@ throw new Error("ipaddr: string is not formatted like an IPv4 CIDR range"); }; + ipaddr.IPv4.subnetMaskFromPrefixLength = function(prefix) { + var filledOctetCount, j, octets; + prefix = parseInt(prefix); + if (prefix < 0 || prefix > 32) { + throw new Error('ipaddr: invalid IPv4 prefix length'); + } + octets = [0, 0, 0, 0]; + j = 0; + filledOctetCount = Math.floor(prefix / 8); + while (j < filledOctetCount) { + octets[j] = 255; + j++; + } + if (filledOctetCount < 4) { + octets[filledOctetCount] = Math.pow(2, prefix % 8) - 1 << 8 - (prefix % 8); + } + return new this(octets); + }; + + ipaddr.IPv4.broadcastAddressFromCIDR = function(string) { + var cidr, error, i, ipInterfaceOctets, octets, subnetMaskOctets; + try { + cidr = this.parseCIDR(string); + ipInterfaceOctets = cidr[0].toByteArray(); + subnetMaskOctets = this.subnetMaskFromPrefixLength(cidr[1]).toByteArray(); + octets = []; + i = 0; + while (i < 4) { + octets.push(parseInt(ipInterfaceOctets[i], 10) | parseInt(subnetMaskOctets[i], 10) ^ 255); + i++; + } + return new this(octets); + } catch (error1) { + error = error1; + throw new Error('ipaddr: the address does not have IPv4 CIDR format'); + } + }; + + ipaddr.IPv4.networkAddressFromCIDR = function(string) { + var cidr, error, i, ipInterfaceOctets, octets, subnetMaskOctets; + try { + cidr = this.parseCIDR(string); + ipInterfaceOctets = cidr[0].toByteArray(); + subnetMaskOctets = this.subnetMaskFromPrefixLength(cidr[1]).toByteArray(); + octets = []; + i = 0; + while (i < 4) { + octets.push(parseInt(ipInterfaceOctets[i], 10) & parseInt(subnetMaskOctets[i], 10)); + i++; + } + return new this(octets); + } catch (error1) { + error = error1; + throw new Error('ipaddr: the address does not have IPv4 CIDR format'); + } + }; + ipaddr.IPv6.parseCIDR = function(string) { var maskLength, match; if (match = string.match(/^(.+)\/(\d+)$/)) { @@ -499,12 +642,12 @@ var e; try { return ipaddr.IPv6.parseCIDR(string); - } catch (_error) { - e = _error; + } catch (error1) { + e = error1; try { return ipaddr.IPv4.parseCIDR(string); - } catch (_error) { - e = _error; + } catch (error1) { + e = error1; throw new Error("ipaddr: the address has neither IPv6 nor IPv4 CIDR format"); } } diff --git a/nodejs/node_modules/ipaddr.js/package.json b/nodejs/node_modules/ipaddr.js/package.json index 83a43f8a7..7af919dc1 100644 --- a/nodejs/node_modules/ipaddr.js/package.json +++ b/nodejs/node_modules/ipaddr.js/package.json @@ -1,49 +1,32 @@ { "_args": [ [ - { - "raw": "ipaddr.js@1.3.0", - "scope": null, - "escapedName": "ipaddr.js", - "name": "ipaddr.js", - "rawSpec": "1.3.0", - "spec": "1.3.0", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/proxy-addr" + "ipaddr.js@1.5.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "ipaddr.js@1.3.0", - "_id": "ipaddr.js@1.3.0", - "_inCache": true, + "_from": "ipaddr.js@1.5.2", + "_id": "ipaddr.js@1.5.2", + "_inBundle": false, + "_integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=", "_location": "/ipaddr.js", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/ipaddr.js-1.3.0.tgz_1489544932893_0.961968986550346" - }, - "_npmUser": { - "name": "whitequark", - "email": "whitequark@whitequark.org" - }, - "_npmVersion": "1.4.21", "_phantomChildren": {}, "_requested": { - "raw": "ipaddr.js@1.3.0", - "scope": null, - "escapedName": "ipaddr.js", + "type": "version", + "registry": true, + "raw": "ipaddr.js@1.5.2", "name": "ipaddr.js", - "rawSpec": "1.3.0", - "spec": "1.3.0", - "type": "version" + "escapedName": "ipaddr.js", + "rawSpec": "1.5.2", + "saveSpec": null, + "fetchSpec": "1.5.2" }, "_requiredBy": [ "/proxy-addr" ], - "_resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz", - "_shasum": "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec", - "_shrinkwrap": null, - "_spec": "ipaddr.js@1.3.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/proxy-addr", + "_resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz", + "_spec": "1.5.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "whitequark", "email": "whitequark@whitequark.org" @@ -54,21 +37,16 @@ "dependencies": {}, "description": "A library for manipulating IPv4 and IPv6 addresses in JavaScript.", "devDependencies": { - "coffee-script": "~1.6", + "coffee-script": "~1.12.6", "nodeunit": ">=0.8.2 <0.8.7", - "uglify-js": "latest" + "uglify-js": "~3.0.19" }, "directories": { "lib": "./lib" }, - "dist": { - "shasum": "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec", - "tarball": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz" - }, "engines": { "node": ">= 0.10" }, - "gitHead": "9c557556e495a2c60a3c656e4f9f8b3a1e14dedc", "homepage": "https://github.com/whitequark/ipaddr.js#readme", "keywords": [ "ip", @@ -77,15 +55,7 @@ ], "license": "MIT", "main": "./lib/ipaddr", - "maintainers": [ - { - "name": "whitequark", - "email": "whitequark@whitequark.org" - } - ], "name": "ipaddr.js", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/whitequark/ipaddr.js.git" @@ -93,5 +63,5 @@ "scripts": { "test": "cake build test" }, - "version": "1.3.0" + "version": "1.5.2" } diff --git a/nodejs/node_modules/ipaddr.js/src/ipaddr.coffee b/nodejs/node_modules/ipaddr.js/src/ipaddr.coffee index 941014c82..6d7236e4e 100644 --- a/nodejs/node_modules/ipaddr.js/src/ipaddr.coffee +++ b/nodejs/node_modules/ipaddr.js/src/ipaddr.coffee @@ -28,6 +28,8 @@ matchCIDR = (first, second, partSize, cidrBits) -> return true # An utility function to ease named range matching. See examples below. +# rangeList can contain both IPv4 and IPv6 subnet entries and will not throw errors +# on matching IPv4 addresses to IPv6 ranges or vice versa. ipaddr.subnetMatch = (address, rangeList, defaultName='unicast') -> for rangeName, rangeSubnets of rangeList # ECMA5 Array.isArray isn't available everywhere @@ -35,7 +37,9 @@ ipaddr.subnetMatch = (address, rangeList, defaultName='unicast') -> rangeSubnets = [ rangeSubnets ] for subnet in rangeSubnets - return rangeName if address.match.apply(address, subnet) + if address.kind() == subnet[0].kind() + if address.match.apply(address, subnet) + return rangeName return defaultName @@ -62,6 +66,10 @@ class ipaddr.IPv4 toString: -> return @octets.join "." + # Symmetrical method strictly for aligning with the IPv6 methods. + toNormalizedString: -> + return this.toString() + # Returns an array of byte-sized values in network order (MSB first) toByteArray: -> return @octets.slice(0) # octets.clone @@ -185,7 +193,7 @@ class ipaddr.IPv6 # Constructs an IPv6 address from an array of eight 16-bit parts # or sixteen 8-bit parts in network order (MSB first). # Throws an error if the input is invalid. - constructor: (parts) -> + constructor: (parts, zoneId) -> if parts.length == 16 @parts = [] for i in [0..14] by 2 @@ -199,6 +207,9 @@ class ipaddr.IPv6 if !(0 <= part <= 0xffff) throw new Error "ipaddr: ipv6 part should fit in 16 bits" + if zoneId + @zoneId = zoneId + # The 'kind' method exists on both IPv4 and IPv6 classes. kind: -> return 'ipv6' @@ -238,7 +249,13 @@ class ipaddr.IPv6 pushPart('') pushPart('') - return compactStringParts.join ":" + addr = compactStringParts.join ":" + + suffix = '' + if @zoneId + suffix = '%' + @zoneId + + return addr + suffix # Returns an array of byte-sized values in network order (MSB first) toByteArray: -> @@ -252,7 +269,13 @@ class ipaddr.IPv6 # Returns the address in expanded format with all zeroes included, like # 2001:db8:8:66:0:0:0:1 toNormalizedString: -> - return (part.toString(16) for part in @parts).join ":" + addr = (part.toString(16) for part in @parts).join ":" + + suffix = '' + if @zoneId + suffix = '%' + @zoneId + + return addr + suffix # Checks if this address matches other one within given CIDR range. match: (other, cidrRange) -> @@ -298,15 +321,58 @@ class ipaddr.IPv6 return new ipaddr.IPv4([high >> 8, high & 0xff, low >> 8, low & 0xff]) + # returns a number of leading ones in IPv6 address, making sure that + # the rest is a solid sequence of 0's (valid netmask) + # returns either the CIDR length or null if mask is not valid + prefixLengthFromSubnetMask: -> + # number of zeroes in octet + zerotable = + 0 : 16 + 32768: 15 + 49152: 14 + 57344: 13 + 61440: 12 + 63488: 11 + 64512: 10 + 65024: 9 + 65280: 8 + 65408: 7 + 65472: 6 + 65504: 5 + 65520: 4 + 65528: 3 + 65532: 2 + 65534: 1 + 65535: 0 + + cidr = 0 + # non-zero encountered stop scanning for zeroes + stop = false + for i in [7..0] by -1 + part = @parts[i] + if part of zerotable + zeros = zerotable[part] + if stop and zeros != 0 + return null + unless zeros == 16 + stop = true + cidr += zeros + else + return null + return 128 - cidr + # IPv6-matching regular expressions. # For IPv6, the task is simpler: it is enough to match the colon-delimited # hexadecimal IPv6 and a transitional variant with dotted-decimal IPv4 at # the end. ipv6Part = "(?:[0-9a-f]+::?)+" +zoneIndex = "%[0-9a-z]{1,}" ipv6Regexes = - native: new RegExp "^(::)?(#{ipv6Part})?([0-9a-f]+)?(::)?$", 'i' + zoneIndex: new RegExp zoneIndex, 'i' + native: new RegExp "^(::)?(#{ipv6Part})?([0-9a-f]+)?(::)?(#{zoneIndex})?$", 'i' transitional: new RegExp "^((?:#{ipv6Part})|(?:::)(?:#{ipv6Part})?)" + - "#{ipv4Part}\\.#{ipv4Part}\\.#{ipv4Part}\\.#{ipv4Part}$", 'i' + "#{ipv4Part}\\.#{ipv4Part}\\.#{ipv4Part}\\.#{ipv4Part}" + + "(#{zoneIndex})?$", 'i' # Expand :: in an IPv6 address or address part consisting of `parts` groups. expandIPv6 = (string, parts) -> @@ -314,6 +380,12 @@ expandIPv6 = (string, parts) -> if string.indexOf('::') != string.lastIndexOf('::') return null + # Remove zone index and save it for later + zoneId = (string.match(ipv6Regexes['zoneIndex']) || [])[0] + if zoneId + zoneId = zoneId.substring(1) + string = string.replace(/%.+$/, '') + # How many parts do we already have? colonCount = 0 lastColon = -1 @@ -342,25 +414,27 @@ expandIPv6 = (string, parts) -> string = string[1..-1] if string[0] == ':' string = string[0..-2] if string[string.length-1] == ':' - return (parseInt(part, 16) for part in string.split(":")) + parts = (parseInt(part, 16) for part in string.split(":")) + return { parts: parts, zoneId: zoneId } # Parse an IPv6 address. ipaddr.IPv6.parser = (string) -> - if string.match(ipv6Regexes['native']) + if ipv6Regexes['native'].test(string) return expandIPv6(string, 8) else if match = string.match(ipv6Regexes['transitional']) - parts = expandIPv6(match[1][0..-2], 6) - if parts + zoneId = match[6] || '' + addr = expandIPv6(match[1][0..-2] + zoneId, 6) + if addr.parts octets = [parseInt(match[2]), parseInt(match[3]), parseInt(match[4]), parseInt(match[5])] for octet in octets if !(0 <= octet <= 255) return null - parts.push(octets[0] << 8 | octets[1]) - parts.push(octets[2] << 8 | octets[3]) - return parts + addr.parts.push(octets[0] << 8 | octets[1]) + addr.parts.push(octets[2] << 8 | octets[3]) + return { parts: addr.parts, zoneId: addr.zoneId } return null @@ -389,20 +463,28 @@ ipaddr.IPv6.isValid = (string) -> return false try - new this(@parser(string)) + addr = @parser(string) + new this(addr.parts, addr.zoneId) return true catch e return false # Tries to parse and validate a string with IPv4/IPv6 address. # Throws an error if it fails. -ipaddr.IPv4.parse = ipaddr.IPv6.parse = (string) -> +ipaddr.IPv4.parse = (string) -> parts = @parser(string) if parts == null throw new Error "ipaddr: string is not formatted like ip address" return new this(parts) +ipaddr.IPv6.parse = (string) -> + addr = @parser(string) + if addr.parts == null + throw new Error "ipaddr: string is not formatted like ip address" + + return new this(addr.parts, addr.zoneId) + ipaddr.IPv4.parseCIDR = (string) -> if match = string.match(/^(.+)\/(\d+)$/) maskLength = parseInt(match[2]) @@ -411,6 +493,55 @@ ipaddr.IPv4.parseCIDR = (string) -> throw new Error "ipaddr: string is not formatted like an IPv4 CIDR range" +# A utility function to return subnet mask in IPv4 format given the prefix length +ipaddr.IPv4.subnetMaskFromPrefixLength = (prefix) -> + prefix = parseInt(prefix) + if prefix < 0 or prefix > 32 + throw new Error('ipaddr: invalid IPv4 prefix length') + octets = [0, 0, 0, 0] + j = 0 + filledOctetCount = Math.floor(prefix / 8) + while j < filledOctetCount + octets[j] = 255 + j++ + if filledOctetCount < 4 + octets[filledOctetCount] = Math.pow(2, (prefix % 8)) - 1 << 8 - (prefix % 8) + new @(octets) + +# A utility function to return broadcast address given the IPv4 interface and prefix length in CIDR notation +ipaddr.IPv4.broadcastAddressFromCIDR = (string) -> + try + cidr = @parseCIDR(string) + ipInterfaceOctets = cidr[0].toByteArray() + subnetMaskOctets = @subnetMaskFromPrefixLength(cidr[1]).toByteArray() + octets = [] + i = 0 + while i < 4 + # Broadcast address is bitwise OR between ip interface and inverted mask + octets.push parseInt(ipInterfaceOctets[i], 10) | parseInt(subnetMaskOctets[i], 10) ^ 255 + i++ + return new @(octets) + catch error + throw new Error('ipaddr: the address does not have IPv4 CIDR format') + return + +# A utility function to return network address given the IPv4 interface and prefix length in CIDR notation +ipaddr.IPv4.networkAddressFromCIDR = (string) -> + try + cidr = @parseCIDR(string) + ipInterfaceOctets = cidr[0].toByteArray() + subnetMaskOctets = @subnetMaskFromPrefixLength(cidr[1]).toByteArray() + octets = [] + i = 0 + while i < 4 + # Network address is bitwise AND between ip interface and mask + octets.push parseInt(ipInterfaceOctets[i], 10) & parseInt(subnetMaskOctets[i], 10) + i++ + return new @(octets) + catch error + throw new Error('ipaddr: the address does not have IPv4 CIDR format') + return + ipaddr.IPv6.parseCIDR = (string) -> if match = string.match(/^(.+)\/(\d+)$/) maskLength = parseInt(match[2]) diff --git a/nodejs/node_modules/ipaddr.js/test/ipaddr.test.coffee b/nodejs/node_modules/ipaddr.js/test/ipaddr.test.coffee index 34ec7d969..eef7a091b 100644 --- a/nodejs/node_modules/ipaddr.js/test/ipaddr.test.coffee +++ b/nodejs/node_modules/ipaddr.js/test/ipaddr.test.coffee @@ -21,6 +21,7 @@ module.exports = 'converts IPv4 to string correctly': (test) -> addr = new ipaddr.IPv4([192, 168, 1, 1]) test.equal(addr.toString(), '192.168.1.1') + test.equal(addr.toNormalizedString(), '192.168.1.1') test.done() 'returns correct kind for IPv4': (test) -> @@ -142,6 +143,46 @@ module.exports = test.equal(new ipaddr.IPv6([0x2001, 0xdb8, 0, 0, 0, 0, 0, 0]).toString(), '2001:db8::') test.done() + 'returns IPv6 zoneIndex': (test) -> + addr = new ipaddr.IPv6([0x2001, 0xdb8, 0xf53a, 0, 0, 0, 0, 1], 'utun0') + test.equal(addr.toNormalizedString(), '2001:db8:f53a:0:0:0:0:1%utun0') + test.equal(addr.toString(), '2001:db8:f53a::1%utun0') + + test.equal( + ipaddr.parse('2001:db8:f53a::1%2').toString(), + '2001:db8:f53a::1%2' + ) + test.equal( + ipaddr.parse('2001:db8:f53a::1%WAT').toString(), + '2001:db8:f53a::1%WAT' + ) + test.equal( + ipaddr.parse('2001:db8:f53a::1%sUp').toString(), + '2001:db8:f53a::1%sUp' + ) + + test.done() + + 'returns IPv6 zoneIndex for IPv4-mapped IPv6 addresses': (test) -> + addr = ipaddr.parse('::ffff:192.168.1.1%eth0') + test.equal(addr.toNormalizedString(), '0:0:0:0:0:ffff:c0a8:101%eth0') + test.equal(addr.toString(), '::ffff:c0a8:101%eth0') + + test.equal( + ipaddr.parse('::ffff:192.168.1.1%2').toString(), + '::ffff:c0a8:101%2' + ) + test.equal( + ipaddr.parse('::ffff:192.168.1.1%WAT').toString(), + '::ffff:c0a8:101%WAT' + ) + test.equal( + ipaddr.parse('::ffff:192.168.1.1%sUp').toString(), + '::ffff:c0a8:101%sUp' + ) + + test.done() + 'returns correct kind for IPv6': (test) -> addr = new ipaddr.IPv6([0x2001, 0xdb8, 0xf53a, 0, 0, 0, 0, 1]) test.equal(addr.kind(), 'ipv6') @@ -156,21 +197,27 @@ module.exports = test.equal(ipaddr.IPv6.isIPv6('2001:db8:F53A::1'), true) test.equal(ipaddr.IPv6.isIPv6('200001::1'), true) test.equal(ipaddr.IPv6.isIPv6('::ffff:192.168.1.1'), true) + test.equal(ipaddr.IPv6.isIPv6('::ffff:192.168.1.1%z'), true) test.equal(ipaddr.IPv6.isIPv6('::ffff:300.168.1.1'), false) test.equal(ipaddr.IPv6.isIPv6('::ffff:300.168.1.1:0'), false) test.equal(ipaddr.IPv6.isIPv6('fe80::wtf'), false) + test.equal(ipaddr.IPv6.isIPv6('fe80::%'), false) test.done() 'validates IPv6 addresses': (test) -> test.equal(ipaddr.IPv6.isValid('2001:db8:F53A::1'), true) test.equal(ipaddr.IPv6.isValid('200001::1'), false) test.equal(ipaddr.IPv6.isValid('::ffff:192.168.1.1'), true) + test.equal(ipaddr.IPv6.isValid('::ffff:192.168.1.1%z'), true) test.equal(ipaddr.IPv6.isValid('::ffff:300.168.1.1'), false) test.equal(ipaddr.IPv6.isValid('::ffff:300.168.1.1:0'), false) test.equal(ipaddr.IPv6.isValid('::ffff:222.1.41.9000'), false) test.equal(ipaddr.IPv6.isValid('2001:db8::F53A::1'), false) test.equal(ipaddr.IPv6.isValid('fe80::wtf'), false) + test.equal(ipaddr.IPv6.isValid('fe80::%'), false) test.equal(ipaddr.IPv6.isValid('2002::2:'), false) + test.equal(ipaddr.IPv6.isValid('::%z'), true) + test.equal(ipaddr.IPv6.isValid(undefined), false) test.done() @@ -180,6 +227,8 @@ module.exports = test.deepEqual(ipaddr.IPv6.parse('2001:db8:F53A::').parts, [0x2001, 0xdb8, 0xf53a, 0, 0, 0, 0, 0]) test.deepEqual(ipaddr.IPv6.parse('::1').parts, [0, 0, 0, 0, 0, 0, 0, 1]) test.deepEqual(ipaddr.IPv6.parse('::').parts, [0, 0, 0, 0, 0, 0, 0, 0]) + test.deepEqual(ipaddr.IPv6.parse('::%z').parts, [0, 0, 0, 0, 0, 0, 0, 0]) + test.deepEqual(ipaddr.IPv6.parse('::%z').zoneId, 'z') test.done() 'barfs at invalid IPv6': (test) -> @@ -194,7 +243,10 @@ module.exports = test.equal(addr.match(ipaddr.IPv6.parse('2001:db8:f53b::1:1'), 48), false) test.equal(addr.match(ipaddr.IPv6.parse('2001:db8:f531::1:1'), 44), true) test.equal(addr.match(ipaddr.IPv6.parse('2001:db8:f500::1'), 40), true) + test.equal(addr.match(ipaddr.IPv6.parse('2001:db8:f500::1%z'), 40), true) + test.equal(addr.match(ipaddr.IPv6.parse('2001:db9:f500::1'), 40), false) test.equal(addr.match(ipaddr.IPv6.parse('2001:db9:f500::1'), 40), false) + test.equal(addr.match(ipaddr.IPv6.parse('2001:db9:f500::1%z'), 40), false) test.equal(addr.match(addr, 128), true) test.done() @@ -205,7 +257,9 @@ module.exports = test.equal(addr.match(ipaddr.IPv6.parseCIDR('2001:db8:f53b::1:1/48')), false) test.equal(addr.match(ipaddr.IPv6.parseCIDR('2001:db8:f531::1:1/44')), true) test.equal(addr.match(ipaddr.IPv6.parseCIDR('2001:db8:f500::1/40')), true) + test.equal(addr.match(ipaddr.IPv6.parseCIDR('2001:db8:f500::1%z/40')), true) test.equal(addr.match(ipaddr.IPv6.parseCIDR('2001:db9:f500::1/40')), false) + test.equal(addr.match(ipaddr.IPv6.parseCIDR('2001:db9:f500::1%z/40')), false) test.equal(addr.match(ipaddr.IPv6.parseCIDR('2001:db8:f53a::1/128')), true) test.throws -> ipaddr.IPv6.parseCIDR('2001:db8:f53a::1') @@ -240,11 +294,13 @@ module.exports = test.equal(ipaddr.IPv6.parse('2001::4242').range(), 'teredo') test.equal(ipaddr.IPv6.parse('2001:db8::3210').range(), 'reserved') test.equal(ipaddr.IPv6.parse('2001:470:8:66::1').range(), 'unicast') + test.equal(ipaddr.IPv6.parse('2001:470:8:66::1%z').range(), 'unicast') test.done() 'is able to determine IP address type': (test) -> test.equal(ipaddr.parse('8.8.8.8').kind(), 'ipv4') test.equal(ipaddr.parse('2001:db8:3312::1').kind(), 'ipv6') + test.equal(ipaddr.parse('2001:db8:3312::1%z').kind(), 'ipv6') test.done() 'throws an error if tried to parse an invalid address': (test) -> @@ -256,6 +312,7 @@ module.exports = test.equal(ipaddr.process('8.8.8.8').kind(), 'ipv4') test.equal(ipaddr.process('2001:db8:3312::1').kind(), 'ipv6') test.equal(ipaddr.process('::ffff:192.168.1.1').kind(), 'ipv4') + test.equal(ipaddr.process('::ffff:192.168.1.1%z').kind(), 'ipv4') test.done() 'correctly converts IPv6 and IPv4 addresses to byte arrays': (test) -> @@ -264,6 +321,9 @@ module.exports = # Fuck yeah. The first byte of Google's IPv6 address is 42. 42! test.deepEqual(ipaddr.parse('2a00:1450:8007::68').toByteArray(), [42, 0x00, 0x14, 0x50, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68 ]) + test.deepEqual(ipaddr.parse('2a00:1450:8007::68%z').toByteArray(), + [42, 0x00, 0x14, 0x50, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68 ]) + test.done() 'correctly parses 1 as an IPv4 address': (test) -> @@ -286,6 +346,7 @@ module.exports = 'does not hang on ::8:8:8:8:8:8:8:8:8': (test) -> test.equal(ipaddr.IPv6.isValid('::8:8:8:8:8:8:8:8:8'), false) + test.equal(ipaddr.IPv6.isValid('::8:8:8:8:8:8:8:8:8%z'), false) test.done() 'subnetMatch does not fail on empty range': (test) -> @@ -298,6 +359,22 @@ module.exports = test.equal(ipaddr.subnetMatch(new ipaddr.IPv4([1,2,3,4]), {subnet: []}, false), false) test.done() + 'subnetMatch does not fail on IPv4 when looking for IPv6': (test) -> + rangelist = {subnet6: ipaddr.parseCIDR('fe80::/64')} + test.equal(ipaddr.subnetMatch(new ipaddr.IPv4([1,2,3,4]), rangelist, false), false) + test.done() + + 'subnetMatch does not fail on IPv6 when looking for IPv4': (test) -> + rangelist = {subnet4: ipaddr.parseCIDR('1.2.3.0/24')} + test.equal(ipaddr.subnetMatch(new ipaddr.IPv6([0xfe80, 0, 0, 0, 0, 0, 0, 1]), rangelist, false), false) + test.done() + + 'subnetMatch can use a hybrid IPv4/IPv6 range list': (test) -> + rangelist = {dual64: [ipaddr.parseCIDR('1.2.4.0/24'), ipaddr.parseCIDR('2001:1:2:3::/64')]} + test.equal(ipaddr.subnetMatch(new ipaddr.IPv4([1,2,4,1]), rangelist, false), 'dual64') + test.equal(ipaddr.subnetMatch(new ipaddr.IPv6([0x2001, 1, 2, 3, 0, 0, 0, 1]), rangelist, false), 'dual64') + test.done() + 'is able to determine IP address type from byte array input': (test) -> test.equal(ipaddr.fromByteArray([0x7f, 0, 0, 1]).kind(), 'ipv4') test.equal(ipaddr.fromByteArray([0x20, 0x01, 0xd, 0xb8, 0xf5, 0x3a, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).kind(), 'ipv6') @@ -344,3 +421,63 @@ module.exports = test.equal(ipaddr.IPv4.parse('255.0.255.0').prefixLengthFromSubnetMask(), null) test.done() + 'prefixLengthFromSubnetMask returns proper CIDR notation for standard IPv6 masks': (test) -> + test.equal(ipaddr.IPv6.parse('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff').prefixLengthFromSubnetMask(), 128) + test.equal(ipaddr.IPv6.parse('ffff:ffff:ffff:ffff::').prefixLengthFromSubnetMask(), 64) + test.equal(ipaddr.IPv6.parse('ffff:ffff:ffff:ff80::').prefixLengthFromSubnetMask(), 57) + test.equal(ipaddr.IPv6.parse('ffff:ffff:ffff::').prefixLengthFromSubnetMask(), 48) + test.equal(ipaddr.IPv6.parse('ffff:ffff:ffff::%z').prefixLengthFromSubnetMask(), 48) + test.equal(ipaddr.IPv6.parse('::').prefixLengthFromSubnetMask(), 0) + test.equal(ipaddr.IPv6.parse('::%z').prefixLengthFromSubnetMask(), 0) + # negative cases + test.equal(ipaddr.IPv6.parse('2001:db8::').prefixLengthFromSubnetMask(), null) + test.equal(ipaddr.IPv6.parse('ffff:0:0:ffff::').prefixLengthFromSubnetMask(), null) + test.equal(ipaddr.IPv6.parse('ffff:0:0:ffff::%z').prefixLengthFromSubnetMask(), null) + test.done() + + 'subnetMaskFromPrefixLength returns correct IPv4 subnet mask given prefix length': (test) -> + + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(0), "0.0.0.0"); + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(1), "128.0.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(2), "192.0.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(3), "224.0.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(4), "240.0.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(5), "248.0.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(6), "252.0.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(7), "254.0.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(8), "255.0.0.0"); + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(9), "255.128.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(10), "255.192.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(11), "255.224.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(12), "255.240.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(13), "255.248.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(14), "255.252.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(15), "255.254.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(16), "255.255.0.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(17), "255.255.128.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(18), "255.255.192.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(19), "255.255.224.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(20), "255.255.240.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(21), "255.255.248.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(22), "255.255.252.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(23), "255.255.254.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(24), "255.255.255.0") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(25), "255.255.255.128") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(26), "255.255.255.192") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(27), "255.255.255.224") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(28), "255.255.255.240") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(29), "255.255.255.248") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(30), "255.255.255.252") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(31), "255.255.255.254") + test.equal(ipaddr.IPv4.subnetMaskFromPrefixLength(32), "255.255.255.255") + test.done() + + 'broadcastAddressFromCIDR returns correct IPv4 broadcast address': (test) -> + test.equal(ipaddr.IPv4.broadcastAddressFromCIDR("172.0.0.1/24"), "172.0.0.255") + test.equal(ipaddr.IPv4.broadcastAddressFromCIDR("172.0.0.1/26"), "172.0.0.63") + test.done() + + 'networkAddressFromCIDR returns correct IPv4 network address': (test) -> + test.equal(ipaddr.IPv4.networkAddressFromCIDR("172.0.0.1/24"), "172.0.0.0") + test.equal(ipaddr.IPv4.networkAddressFromCIDR("172.0.0.1/5"), "168.0.0.0") + test.done() diff --git a/nodejs/node_modules/isarray/package.json b/nodejs/node_modules/isarray/package.json index f18280da1..4bc57be7b 100644 --- a/nodejs/node_modules/isarray/package.json +++ b/nodejs/node_modules/isarray/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "isarray@0.0.1", - "scope": null, - "escapedName": "isarray", - "name": "isarray", - "rawSpec": "0.0.1", - "spec": "0.0.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/readable-stream" + "isarray@0.0.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "isarray@0.0.1", "_id": "isarray@0.0.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "_location": "/isarray", - "_npmUser": { - "name": "juliangruber", - "email": "julian@juliangruber.com" - }, - "_npmVersion": "1.2.18", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "isarray@0.0.1", - "scope": null, - "escapedName": "isarray", "name": "isarray", + "escapedName": "isarray", "rawSpec": "0.0.1", - "spec": "0.0.1", - "type": "version" + "saveSpec": null, + "fetchSpec": "0.0.1" }, "_requiredBy": [ "/readable-stream" ], "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf", - "_shrinkwrap": null, - "_spec": "isarray@0.0.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/readable-stream", + "_spec": "0.0.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Julian Gruber", "email": "mail@juliangruber.com", @@ -53,11 +40,6 @@ "devDependencies": { "tap": "*" }, - "directories": {}, - "dist": { - "shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf", - "tarball": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, "homepage": "https://github.com/juliangruber/isarray", "keywords": [ "browser", @@ -66,15 +48,7 @@ ], "license": "MIT", "main": "index.js", - "maintainers": [ - { - "name": "juliangruber", - "email": "julian@juliangruber.com" - } - ], "name": "isarray", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/juliangruber/isarray.git" diff --git a/nodejs/node_modules/lame/build/Makefile b/nodejs/node_modules/lame/build/Makefile index 360ad6c01..e615cd2df 100644 --- a/nodejs/node_modules/lame/build/Makefile +++ b/nodejs/node_modules/lame/build/Makefile @@ -361,8 +361,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\ endif quiet_cmd_regen_makefile = ACTION Regenerating $@ -cmd_regen_makefile = cd $(srcdir); /Users/muammar/github/mkchromecast/nodejs/node-7.10.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/muammar/github/mkchromecast/nodejs/node_modules/lame/build/config.gypi -I/Users/muammar/github/mkchromecast/nodejs/node-7.10.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/muammar/.node-gyp/7.10.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/muammar/.node-gyp/7.10.0" "-Dnode_gyp_dir=/Users/muammar/github/mkchromecast/nodejs/node-7.10.0/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/Users/muammar/github/mkchromecast/nodejs/node_modules/lame" binding.gyp -Makefile: $(srcdir)/deps/mpg123/mpg123.gyp $(srcdir)/../../node-7.10.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/deps/lame/libmp3lame.gyp $(srcdir)/binding.gyp $(srcdir)/build/config.gypi $(srcdir)/../../../../../.node-gyp/7.10.0/include/node/common.gypi +cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/muammar/github/mkchromecast/nodejs/node_modules/lame/build/config.gypi -I/usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/muammar/.node-gyp/9.3.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/muammar/.node-gyp/9.3.0" "-Dnode_gyp_dir=/usr/local/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/Users/muammar/.node-gyp/9.3.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/muammar/github/mkchromecast/nodejs/node_modules/lame" "-Dnode_engine=v8" binding.gyp +Makefile: $(srcdir)/deps/mpg123/mpg123.gyp $(srcdir)/deps/lame/libmp3lame.gyp $(srcdir)/binding.gyp $(srcdir)/../../../../../.node-gyp/9.3.0/include/node/common.gypi $(srcdir)/../../../../../../../usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(call do_cmd,regen_makefile) # "all" is a concatenation of the "all" targets from all the included diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/bindings.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/bindings.o.d index 5b35fd753..a2e9c0fcd 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/bindings.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/bindings.o.d @@ -1,19 +1,20 @@ -cmd_Release/obj.target/bindings/src/bindings.o := c++ '-DNODE_GYP_MODULE_NAME=bindings' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../../nan -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bindings/src/bindings.o.d.raw -c -o Release/obj.target/bindings/src/bindings.o ../src/bindings.cc +cmd_Release/obj.target/bindings/src/bindings.o := c++ '-DNODE_GYP_MODULE_NAME=bindings' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../../nan -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bindings/src/bindings.o.d.raw -c -o Release/obj.target/bindings/src/bindings.o ../src/bindings.cc Release/obj.target/bindings/src/bindings.o: ../src/bindings.cc \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8config.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_version.h \ - ../../nan/nan.h /Users/muammar/.node-gyp/7.10.0/include/node/uv.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8config.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_version.h \ + ../../nan/nan.h /Users/muammar/.node-gyp/9.3.0/include/node/uv.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h \ ../../nan/nan_callbacks.h ../../nan/nan_callbacks_12_inl.h \ ../../nan/nan_maybe_43_inl.h ../../nan/nan_converters.h \ ../../nan/nan_converters_43_inl.h ../../nan/nan_new.h \ @@ -22,21 +23,22 @@ Release/obj.target/bindings/src/bindings.o: ../src/bindings.cc \ ../../nan/nan_object_wrap.h ../../nan/nan_private.h \ ../../nan/nan_typedarray_contents.h ../../nan/nan_json.h ../src/bindings.cc: -/Users/muammar/.node-gyp/7.10.0/include/node/v8.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8config.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8config.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_version.h: ../../nan/nan.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h: -/Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h: +/Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h: ../../nan/nan_callbacks.h: ../../nan/nan_callbacks_12_inl.h: ../../nan/nan_maybe_43_inl.h: diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/node_lame.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/node_lame.o.d index 112377bec..1054421f7 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/node_lame.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/node_lame.o.d @@ -1,20 +1,21 @@ -cmd_Release/obj.target/bindings/src/node_lame.o := c++ '-DNODE_GYP_MODULE_NAME=bindings' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../../nan -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bindings/src/node_lame.o.d.raw -c -o Release/obj.target/bindings/src/node_lame.o ../src/node_lame.cc +cmd_Release/obj.target/bindings/src/node_lame.o := c++ '-DNODE_GYP_MODULE_NAME=bindings' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../../nan -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bindings/src/node_lame.o.d.raw -c -o Release/obj.target/bindings/src/node_lame.o ../src/node_lame.cc Release/obj.target/bindings/src/node_lame.o: ../src/node_lame.cc \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8config.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8config.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h \ ../src/node_pointer.h ../../nan/nan.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h \ ../../nan/nan_callbacks.h ../../nan/nan_callbacks_12_inl.h \ ../../nan/nan_maybe_43_inl.h ../../nan/nan_converters.h \ ../../nan/nan_converters_43_inl.h ../../nan/nan_new.h \ @@ -24,22 +25,23 @@ Release/obj.target/bindings/src/node_lame.o: ../src/node_lame.cc \ ../../nan/nan_typedarray_contents.h ../../nan/nan_json.h \ ../src/node_lame.h ../deps/lame/include/lame.h ../src/node_lame.cc: -/Users/muammar/.node-gyp/7.10.0/include/node/v8.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8config.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8config.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h: ../src/node_pointer.h: ../../nan/nan.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h: -/Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h: +/Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h: ../../nan/nan_callbacks.h: ../../nan/nan_callbacks_12_inl.h: ../../nan/nan_maybe_43_inl.h: diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/node_mpg123.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/node_mpg123.o.d index a4231074e..fe645dec2 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/node_mpg123.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/bindings/src/node_mpg123.o.d @@ -1,20 +1,21 @@ -cmd_Release/obj.target/bindings/src/node_mpg123.o := c++ '-DNODE_GYP_MODULE_NAME=bindings' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../../nan -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bindings/src/node_mpg123.o.d.raw -c -o Release/obj.target/bindings/src/node_mpg123.o ../src/node_mpg123.cc +cmd_Release/obj.target/bindings/src/node_mpg123.o := c++ '-DNODE_GYP_MODULE_NAME=bindings' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../../nan -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bindings/src/node_mpg123.o.d.raw -c -o Release/obj.target/bindings/src/node_mpg123.o ../src/node_mpg123.cc Release/obj.target/bindings/src/node_mpg123.o: ../src/node_mpg123.cc \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8config.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8config.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h \ ../src/node_pointer.h ../../nan/nan.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h \ ../../nan/nan_callbacks.h ../../nan/nan_callbacks_12_inl.h \ ../../nan/nan_maybe_43_inl.h ../../nan/nan_converters.h \ ../../nan/nan_converters_43_inl.h ../../nan/nan_new.h \ @@ -24,22 +25,23 @@ Release/obj.target/bindings/src/node_mpg123.o: ../src/node_mpg123.cc \ ../../nan/nan_typedarray_contents.h ../../nan/nan_json.h \ ../src/node_mpg123.h ../deps/mpg123/config/mac/x64/mpg123.h ../src/node_mpg123.cc: -/Users/muammar/.node-gyp/7.10.0/include/node/v8.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8config.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8config.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h: ../src/node_pointer.h: ../../nan/nan.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h: -/Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h: +/Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h: ../../nan/nan_callbacks.h: ../../nan/nan_callbacks_12_inl.h: ../../nan/nan_maybe_43_inl.h: diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o.d index 61434f811..fed7986b2 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=lamevectorroutines' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o.d.raw -c -o Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o ../deps/lame/libmp3lame/vector/xmm_quantize_sub.c +cmd_Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=lamevectorroutines' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o.d.raw -c -o Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o ../deps/lame/libmp3lame/vector/xmm_quantize_sub.c Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o: \ ../deps/lame/libmp3lame/vector/xmm_quantize_sub.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o.d index 285f3c443..a1bb0629c 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o ../deps/lame/libmp3lame/VbrTag.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o ../deps/lame/libmp3lame/VbrTag.c Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o: \ ../deps/lame/libmp3lame/VbrTag.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o.d index 0708e1106..b4c0ea3da 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o ../deps/lame/libmp3lame/bitstream.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o ../deps/lame/libmp3lame/bitstream.c Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o: \ ../deps/lame/libmp3lame/bitstream.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o.d index 027ad2c5c..b998afe6b 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o ../deps/lame/libmp3lame/encoder.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o ../deps/lame/libmp3lame/encoder.c Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o: \ ../deps/lame/libmp3lame/encoder.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o.d index a9b7f3d58..cf1ed36b3 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o ../deps/lame/libmp3lame/fft.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o ../deps/lame/libmp3lame/fft.c Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o: \ ../deps/lame/libmp3lame/fft.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o.d index cad8a45da..e65073fea 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o ../deps/lame/libmp3lame/gain_analysis.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o ../deps/lame/libmp3lame/gain_analysis.c Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o: \ ../deps/lame/libmp3lame/gain_analysis.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o.d index 90acf8db9..6a0003968 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o ../deps/lame/libmp3lame/id3tag.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o ../deps/lame/libmp3lame/id3tag.c Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o: \ ../deps/lame/libmp3lame/id3tag.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o.d index d10b74f91..9e0eba474 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o ../deps/lame/libmp3lame/lame.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o ../deps/lame/libmp3lame/lame.c Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o: \ ../deps/lame/libmp3lame/lame.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o.d index 414a5eb40..c667103b2 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o ../deps/lame/libmp3lame/newmdct.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o ../deps/lame/libmp3lame/newmdct.c Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o: \ ../deps/lame/libmp3lame/newmdct.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o.d index f881fe012..64b3a49dd 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o ../deps/lame/libmp3lame/presets.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o ../deps/lame/libmp3lame/presets.c Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o: \ ../deps/lame/libmp3lame/presets.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o.d index 40f544135..4d748dba0 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o ../deps/lame/libmp3lame/psymodel.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o ../deps/lame/libmp3lame/psymodel.c Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o: \ ../deps/lame/libmp3lame/psymodel.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o.d index 8aa137e9d..2d4540341 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o ../deps/lame/libmp3lame/quantize.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o ../deps/lame/libmp3lame/quantize.c Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o: \ ../deps/lame/libmp3lame/quantize.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o.d index 40e89edf2..9b1b00c64 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o ../deps/lame/libmp3lame/quantize_pvt.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o ../deps/lame/libmp3lame/quantize_pvt.c Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o: \ ../deps/lame/libmp3lame/quantize_pvt.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o.d index 4d184d4f0..6a76d4553 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o ../deps/lame/libmp3lame/reservoir.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o ../deps/lame/libmp3lame/reservoir.c Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o: \ ../deps/lame/libmp3lame/reservoir.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o.d index 296b2188e..09fe52a1a 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o ../deps/lame/libmp3lame/set_get.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o ../deps/lame/libmp3lame/set_get.c Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o: \ ../deps/lame/libmp3lame/set_get.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o.d index 7ad6b0e04..17f2460ff 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o ../deps/lame/libmp3lame/tables.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o ../deps/lame/libmp3lame/tables.c Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o: \ ../deps/lame/libmp3lame/tables.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/libmp3lame/machine.h ../deps/lame/libmp3lame/version.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o.d index ef71df094..f65de1cd0 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o ../deps/lame/libmp3lame/takehiro.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o ../deps/lame/libmp3lame/takehiro.c Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o: \ ../deps/lame/libmp3lame/takehiro.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o.d index 0de48c100..5ff0b0393 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o ../deps/lame/libmp3lame/util.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o ../deps/lame/libmp3lame/util.c Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o: \ ../deps/lame/libmp3lame/util.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o.d index 1921ab0d0..72f09b994 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o ../deps/lame/libmp3lame/vbrquantize.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o ../deps/lame/libmp3lame/vbrquantize.c Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o: \ ../deps/lame/libmp3lame/vbrquantize.c \ ../deps/lame/config/mac/x64/config.h ../deps/lame/include/lame.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o.d index d8f6f1668..15b120a60 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o ../deps/lame/libmp3lame/version.c +cmd_Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o := cc '-DPIC' '-DHAVE_CONFIG_H' '-DNODE_GYP_MODULE_NAME=mp3lame' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DNDEBUG' -I../deps/lame/include -I../deps/lame/libmp3lame -I../deps/lame/libmp3lame/vector -I../deps/lame/config/mac/x64 -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o.d.raw -c -o Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o ../deps/lame/libmp3lame/version.c Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o: \ ../deps/lame/libmp3lame/version.c ../deps/lame/config/mac/x64/config.h \ ../deps/lame/include/lame.h ../deps/lame/libmp3lame/machine.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o.d index d7095cf3c..1493467fa 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o ../deps/mpg123/src/libmpg123/compat.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o ../deps/mpg123/src/libmpg123/compat.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o: \ ../deps/mpg123/src/libmpg123/compat.c \ ../deps/mpg123/config/mac/x64/config.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o.d index 9938e0a4e..ebfd77282 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o ../deps/mpg123/src/libmpg123/dct64.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o ../deps/mpg123/src/libmpg123/dct64.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o: \ ../deps/mpg123/src/libmpg123/dct64.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o.d index e1f9b7365..fafa5d314 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o ../deps/mpg123/src/libmpg123/dct64_x86_64.S +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o ../deps/mpg123/src/libmpg123/dct64_x86_64.S Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o: \ ../deps/mpg123/src/libmpg123/dct64_x86_64.S \ ../deps/mpg123/src/libmpg123/mangle.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o.d index 0ca3a1330..b80a38c9c 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o ../deps/mpg123/src/libmpg123/dct64_x86_64_float.S +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o ../deps/mpg123/src/libmpg123/dct64_x86_64_float.S Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o: \ ../deps/mpg123/src/libmpg123/dct64_x86_64_float.S \ ../deps/mpg123/src/libmpg123/mangle.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o.d index 0e07f3475..cd767fdf0 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o ../deps/mpg123/src/libmpg123/equalizer.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o ../deps/mpg123/src/libmpg123/equalizer.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o: \ ../deps/mpg123/src/libmpg123/equalizer.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o.d index 2a64a1718..ba2c78e96 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o ../deps/mpg123/src/libmpg123/feature.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o ../deps/mpg123/src/libmpg123/feature.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o: \ ../deps/mpg123/src/libmpg123/feature.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o.d index 8a4b4941f..cfc9ebb20 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o ../deps/mpg123/src/libmpg123/format.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o ../deps/mpg123/src/libmpg123/format.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o: \ ../deps/mpg123/src/libmpg123/format.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o.d index 40982d69a..952f773df 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o ../deps/mpg123/src/libmpg123/frame.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o ../deps/mpg123/src/libmpg123/frame.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o: \ ../deps/mpg123/src/libmpg123/frame.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o.d index 397a6fbe1..d5e82d152 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o ../deps/mpg123/src/libmpg123/icy.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o ../deps/mpg123/src/libmpg123/icy.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o: \ ../deps/mpg123/src/libmpg123/icy.c ../deps/mpg123/src/libmpg123/icy.h \ ../deps/mpg123/src/libmpg123/compat.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o.d index 3e17cf504..8fc05e38e 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o ../deps/mpg123/src/libmpg123/icy2utf8.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o ../deps/mpg123/src/libmpg123/icy2utf8.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o: \ ../deps/mpg123/src/libmpg123/icy2utf8.c \ ../deps/mpg123/src/libmpg123/compat.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o.d index 0ae010603..4daaf5ae0 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o ../deps/mpg123/src/libmpg123/id3.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o ../deps/mpg123/src/libmpg123/id3.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o: \ ../deps/mpg123/src/libmpg123/id3.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o.d index 4dbd1b02a..a9726db6e 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o ../deps/mpg123/src/libmpg123/index.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o ../deps/mpg123/src/libmpg123/index.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o: \ ../deps/mpg123/src/libmpg123/index.c \ ../deps/mpg123/src/libmpg123/index.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o.d index b79d45731..0b0079193 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o ../deps/mpg123/src/libmpg123/layer1.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o ../deps/mpg123/src/libmpg123/layer1.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o: \ ../deps/mpg123/src/libmpg123/layer1.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o.d index 4b350bd14..66152ea07 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o ../deps/mpg123/src/libmpg123/layer2.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o ../deps/mpg123/src/libmpg123/layer2.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o: \ ../deps/mpg123/src/libmpg123/layer2.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o.d index 3ecc0e600..6e706ff48 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o ../deps/mpg123/src/libmpg123/layer3.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o ../deps/mpg123/src/libmpg123/layer3.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o: \ ../deps/mpg123/src/libmpg123/layer3.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o.d index 5b066d856..7b1f114bc 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o ../deps/mpg123/src/libmpg123/libmpg123.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o ../deps/mpg123/src/libmpg123/libmpg123.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o: \ ../deps/mpg123/src/libmpg123/libmpg123.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o.d index 27661ad73..3a427ef2d 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o ../deps/mpg123/src/libmpg123/ntom.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o ../deps/mpg123/src/libmpg123/ntom.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o: \ ../deps/mpg123/src/libmpg123/ntom.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o.d index c625dbc66..8852f6ae8 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o ../deps/mpg123/src/libmpg123/optimize.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o ../deps/mpg123/src/libmpg123/optimize.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o: \ ../deps/mpg123/src/libmpg123/optimize.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o.d index 10dd7a15f..680bcccb2 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o ../deps/mpg123/src/libmpg123/parse.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o ../deps/mpg123/src/libmpg123/parse.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o: \ ../deps/mpg123/src/libmpg123/parse.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o.d index 6621eb716..78b8c9997 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o ../deps/mpg123/src/libmpg123/readers.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o ../deps/mpg123/src/libmpg123/readers.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o: \ ../deps/mpg123/src/libmpg123/readers.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o.d index 399eed6b7..b98dc0481 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o ../deps/mpg123/src/libmpg123/stringbuf.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o ../deps/mpg123/src/libmpg123/stringbuf.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o: \ ../deps/mpg123/src/libmpg123/stringbuf.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o.d index e1d8aeb69..4b94391ca 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o ../deps/mpg123/src/libmpg123/synth.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o ../deps/mpg123/src/libmpg123/synth.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o: \ ../deps/mpg123/src/libmpg123/synth.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o.d index 8526b2a24..46104eb42 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o ../deps/mpg123/src/libmpg123/synth_8bit.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o ../deps/mpg123/src/libmpg123/synth_8bit.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o: \ ../deps/mpg123/src/libmpg123/synth_8bit.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o.d index a460d8c95..2cd2b4aaa 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o ../deps/mpg123/src/libmpg123/synth_real.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o ../deps/mpg123/src/libmpg123/synth_real.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o: \ ../deps/mpg123/src/libmpg123/synth_real.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o.d index 0b2404eea..75cd887dd 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o ../deps/mpg123/src/libmpg123/synth_s32.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o ../deps/mpg123/src/libmpg123/synth_s32.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o: \ ../deps/mpg123/src/libmpg123/synth_s32.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o.d index 88a96a99d..100a14f30 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o ../deps/mpg123/src/libmpg123/synth_stereo_x86_64.S +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o ../deps/mpg123/src/libmpg123/synth_stereo_x86_64.S Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o: \ ../deps/mpg123/src/libmpg123/synth_stereo_x86_64.S \ ../deps/mpg123/src/libmpg123/mangle.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o.d index 56e504802..8f9cbb193 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o ../deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.S +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o ../deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.S Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o: \ ../deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.S \ ../deps/mpg123/src/libmpg123/mangle.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o.d index b7668ffe5..12c590a8b 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o ../deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.S +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o ../deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.S Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o: \ ../deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.S \ ../deps/mpg123/src/libmpg123/mangle.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o.d index 1c9f35c05..25cc74dc5 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o ../deps/mpg123/src/libmpg123/synth_x86_64.S +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o ../deps/mpg123/src/libmpg123/synth_x86_64.S Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o: \ ../deps/mpg123/src/libmpg123/synth_x86_64.S \ ../deps/mpg123/src/libmpg123/mangle.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o.d index 60929a53d..bd59ac72f 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o ../deps/mpg123/src/libmpg123/synth_x86_64_float.S +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o ../deps/mpg123/src/libmpg123/synth_x86_64_float.S Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o: \ ../deps/mpg123/src/libmpg123/synth_x86_64_float.S \ ../deps/mpg123/src/libmpg123/mangle.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o.d index 0806d232d..176fec34f 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o ../deps/mpg123/src/libmpg123/synth_x86_64_s32.S +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o ../deps/mpg123/src/libmpg123/synth_x86_64_s32.S Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o: \ ../deps/mpg123/src/libmpg123/synth_x86_64_s32.S \ ../deps/mpg123/src/libmpg123/mangle.h \ diff --git a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o.d b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o.d index edce4a2ae..8554d38bb 100644 --- a/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o.d +++ b/nodejs/node_modules/lame/build/Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o ../deps/mpg123/src/libmpg123/tabinit.c +cmd_Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o := cc '-DNODE_GYP_MODULE_NAME=mpg123' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DPIC' '-DNOXFERMEM' '-DHAVE_CONFIG_H' '-DOPT_X86_64' '-DREAL_IS_FLOAT' '-DNDEBUG' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../deps/mpg123/src/libmpg123 -I../deps/mpg123/config/mac/x64 -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o.d.raw -c -o Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o ../deps/mpg123/src/libmpg123/tabinit.c Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o: \ ../deps/mpg123/src/libmpg123/tabinit.c \ ../deps/mpg123/src/libmpg123/mpg123lib_intern.h \ diff --git a/nodejs/node_modules/lame/build/Release/bindings.node b/nodejs/node_modules/lame/build/Release/bindings.node index 6e5410f71..79dddf45e 100755 Binary files a/nodejs/node_modules/lame/build/Release/bindings.node and b/nodejs/node_modules/lame/build/Release/bindings.node differ diff --git a/nodejs/node_modules/lame/build/Release/liblamevectorroutines.a b/nodejs/node_modules/lame/build/Release/liblamevectorroutines.a index 1348cc083..8338aba73 100644 Binary files a/nodejs/node_modules/lame/build/Release/liblamevectorroutines.a and b/nodejs/node_modules/lame/build/Release/liblamevectorroutines.a differ diff --git a/nodejs/node_modules/lame/build/Release/libmp3lame.a b/nodejs/node_modules/lame/build/Release/libmp3lame.a index 081cb86a8..457b7789d 100644 Binary files a/nodejs/node_modules/lame/build/Release/libmp3lame.a and b/nodejs/node_modules/lame/build/Release/libmp3lame.a differ diff --git a/nodejs/node_modules/lame/build/Release/libmpg123.a b/nodejs/node_modules/lame/build/Release/libmpg123.a index 5d24fe90e..5f1ad5195 100644 Binary files a/nodejs/node_modules/lame/build/Release/libmpg123.a and b/nodejs/node_modules/lame/build/Release/libmpg123.a differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/bindings.o b/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/bindings.o index 34e54f06b..4a541784e 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/bindings.o and b/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/bindings.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/node_lame.o b/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/node_lame.o index 63f1660dc..91d2b0dc5 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/node_lame.o and b/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/node_lame.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/node_mpg123.o b/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/node_mpg123.o index d02ecd2e2..447ee5edd 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/node_mpg123.o and b/nodejs/node_modules/lame/build/Release/obj.target/bindings/src/node_mpg123.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o b/nodejs/node_modules/lame/build/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o index b9a911f83..0650a9be2 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o and b/nodejs/node_modules/lame/build/Release/obj.target/lamevectorroutines/deps/lame/libmp3lame/vector/xmm_quantize_sub.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o index 5a0f4ab36..b9613bb4f 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/VbrTag.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o index 107facd2b..3a2627152 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/bitstream.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o index 01307e250..a2e152786 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/encoder.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o index 05fd63aa1..e97aca992 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/fft.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o index 16648bcc5..d4549872f 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/gain_analysis.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o index 1585341b6..2b1e9a7b1 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/id3tag.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o index 0102cc758..91319cacd 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/lame.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o index 9aacf6246..7853fd804 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/newmdct.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o index 7672453ac..7bb668ce1 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/presets.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o index 98f1f6694..2fff41e45 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/psymodel.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o index f3a641cec..61f15f2ef 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o index e8c77e839..4828ae7d3 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/quantize_pvt.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o index 899827465..7521096cc 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/reservoir.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o index 564a68bbd..cef6ecca1 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/set_get.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o index dff0260e6..d104dfffe 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/tables.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o index 1b29a1389..5c681e9f5 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/takehiro.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o index ad8ac3784..5a7ead089 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/util.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o index 527b61f4b..c9e8e885f 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/vbrquantize.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o index 127b94fe6..0a453a4ce 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o and b/nodejs/node_modules/lame/build/Release/obj.target/mp3lame/deps/lame/libmp3lame/version.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o index be2cd3725..2461dd6ae 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/compat.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o index df9baea3f..48e5dea25 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o index f5f14be8c..bbe8ddb0d 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o index c0885da34..4a14ba58d 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/dct64_x86_64_float.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o index 13ddf05e6..94633f17f 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/equalizer.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o index 5300a182c..dae022c42 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/feature.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o index ebd7ce814..f64681c00 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/format.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o index a5bd3f312..d3bdcb5c3 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/frame.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o index 9664b1409..74b704415 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o index 86c9fbd40..10fe86ae2 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/icy2utf8.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o index e877eb551..b468e7f8b 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/id3.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o index 6a2759ff0..5eaced231 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/index.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o index 025f173bb..8e8b6bb5c 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer1.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o index 39e1e8828..ea66065ab 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer2.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o index 74ab19567..35eff0ea1 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/layer3.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o index 2dbe32eb8..2561ce30f 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/libmpg123.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o index 045db4c5f..0035c66bc 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/ntom.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o index bc2f92378..5210deb51 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/optimize.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o index fd72b44ec..dff64cf09 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/parse.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o index 9b8908f4a..5f09b159d 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/readers.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o index 42c097b52..28da899b8 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/stringbuf.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o index 48c2e26e4..81b95debb 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o index a52b4f60c..602ccfa4f 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_8bit.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o index 0acc70e57..6b0e8a482 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_real.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o index 99225d2b5..6cdae7c8a 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_s32.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o index ab3258711..4de4e487d 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o index 3a741fe02..3fe7dc97c 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_float.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o index 418111922..9cf52ae43 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_stereo_x86_64_s32.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o index 809f131a3..2fb5d7e6d 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o index 5fbaa95f1..571b887bc 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_float.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o index fc0698e57..b094a4457 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/synth_x86_64_s32.o differ diff --git a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o index 75c003f14..dc2724ec3 100644 Binary files a/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o and b/nodejs/node_modules/lame/build/Release/obj.target/mpg123/deps/mpg123/src/libmpg123/tabinit.o differ diff --git a/nodejs/node_modules/lame/build/bindings.target.mk b/nodejs/node_modules/lame/build/bindings.target.mk index 571d4bbc2..bd552e63c 100644 --- a/nodejs/node_modules/lame/build/bindings.target.mk +++ b/nodejs/node_modules/lame/build/bindings.target.mk @@ -12,7 +12,8 @@ DEFS_Debug := \ '-D_FILE_OFFSET_BITS=64' \ '-DBUILDING_NODE_EXTENSION' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -45,10 +46,10 @@ CFLAGS_OBJC_Debug := CFLAGS_OBJCC_Debug := INCS_Debug := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/../nan \ -I$(srcdir)/deps/lame/include \ -I$(srcdir)/deps/lame/libmp3lame \ @@ -98,10 +99,10 @@ CFLAGS_OBJC_Release := CFLAGS_OBJCC_Release := INCS_Release := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/../nan \ -I$(srcdir)/deps/lame/include \ -I$(srcdir)/deps/lame/libmp3lame \ diff --git a/nodejs/node_modules/lame/build/config.gypi b/nodejs/node_modules/lame/build/config.gypi index 0e7d2a709..3078e03d2 100644 --- a/nodejs/node_modules/lame/build/config.gypi +++ b/nodejs/node_modules/lame/build/config.gypi @@ -11,6 +11,8 @@ "asan": 0, "coverage": "false", "debug_devtools": "node", + "debug_http2": "false", + "debug_nghttp2": "false", "force_dynamic_crt": 0, "host_arch": "x64", "icu_gyp_path": "tools/icu/icu-system.gyp", @@ -20,14 +22,15 @@ "node_enable_d8": "false", "node_enable_v8_vtunejit": "false", "node_install_npm": "false", - "node_module_version": 51, + "node_module_version": 59, "node_no_browser_globals": "false", - "node_prefix": "/usr/local/Cellar/node/7.10.0", + "node_prefix": "/usr/local/Cellar/node/9.3.0_1", "node_release_urlbase": "", "node_shared": "false", "node_shared_cares": "false", "node_shared_http_parser": "false", "node_shared_libuv": "false", + "node_shared_nghttp2": "false", "node_shared_openssl": "false", "node_shared_zlib": "false", "node_tag": "", @@ -38,35 +41,37 @@ "node_use_openssl": "true", "node_use_perfctr": "false", "node_use_v8_platform": "true", + "node_without_node_options": "false", "openssl_fips": "", "openssl_no_asm": 0, - "shlib_suffix": "51.dylib", + "shlib_suffix": "59.dylib", "target_arch": "x64", "uv_parent_path": "/deps/uv/", "uv_use_dtrace": "true", "v8_enable_gdbjit": 0, "v8_enable_i18n_support": 1, - "v8_inspector": "true", + "v8_enable_inspector": 1, "v8_no_strict_aliasing": 1, "v8_optimized_debug": 0, + "v8_promise_internal_field_count": 1, "v8_random_seed": 0, + "v8_trace_maps": 0, "v8_use_snapshot": "true", "want_separate_host_toolset": 0, - "want_separate_host_toolset_mkpeephole": 0, - "xcode_version": "8.1", - "nodedir": "/Users/muammar/.node-gyp/7.10.0", - "copy_dev_lib": "true", + "xcode_version": "9.0", + "nodedir": "/Users/muammar/.node-gyp/9.3.0", "standalone_static_library": 1, "dry_run": "", "legacy_bundling": "", "save_dev": "", "browser": "", + "commit_hooks": "true", "only": "", "viewer": "man", "also": "", "rollback": "true", "usage": "", - "globalignorefile": "/usr/local/Cellar/node/7.10.0/etc/npmignore", + "globalignorefile": "/usr/local/etc/npmignore", "init_author_url": "", "maxsockets": "50", "shell": "/bin/zsh", @@ -74,6 +79,7 @@ "parseable": "", "shrinkwrap": "true", "init_license": "ISC", + "timing": "", "if_present": "", "cache_max": "Infinity", "init_author_email": "", @@ -87,41 +93,53 @@ "key": "", "message": "%s", "versions": "", - "globalconfig": "/usr/local/Cellar/node/7.10.0/etc/npmrc", + "globalconfig": "/usr/local/etc/npmrc", "always_auth": "", "logs_max": "10", + "prefer_online": "", "cache_lock_retries": "10", "global_style": "", "heading": "npm", "fetch_retry_mintimeout": "10000", - "proprietary_attribs": "true", + "offline": "", + "read_only": "", "searchlimit": "20", "access": "", "json": "", + "allow_same_version": "", "description": "true", "engine_strict": "", "https_proxy": "", "init_module": "/Users/muammar/.npm-init.js", "userconfig": "/Users/muammar/.npmrc", - "node_version": "7.10.0", - "user": "1000", + "cidr": "", + "node_version": "9.3.0", + "user": "", + "auth_type": "legacy", "editor": "vi", - "save": "", + "ignore_prepublish": "", + "save": "true", + "script_shell": "", "tag": "latest", "global": "", "progress": "true", + "ham_it_up": "", "optional": "true", "searchstaleness": "900", "bin_links": "true", "force": "", + "save_prod": "", "searchopts": "", "depth": "Infinity", + "node_gyp": "/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js", "rebuild_bundle": "true", + "sso_poll_frequency": "500", "unicode": "true", "fetch_retry_maxtimeout": "60000", "ca": "", "save_prefix": "^", "scripts_prepend_node_path": "warn-only", + "sso_type": "oauth", "strict_ssl": "true", "tag_version_prefix": "v", "dev": "", @@ -129,19 +147,24 @@ "group": "20", "save_exact": "", "cache_lock_stale": "60000", + "prefer_offline": "", "version": "", "cache_min": "10", + "otp": "", "cache": "/Users/muammar/.npm", "searchexclude": "", "color": "true", + "package_lock": "true", + "package_lock_only": "", "save_optional": "", - "user_agent": "npm/4.2.0 node/v7.10.0 darwin x64", + "user_agent": "npm/5.6.0 node/v9.3.0 darwin x64", "ignore_scripts": "", "cache_lock_wait": "10000", "production": "", "save_bundle": "", "send_metrics": "", "init_version": "1.0.0", + "node_options": "", "umask": "0022", "scope": "", "git": "git", @@ -149,7 +172,7 @@ "onload_script": "", "tmp": "/var/folders/st/bkg3wlq1339gymvv4fq20ll40000z8/T", "unsafe_perm": "true", - "link": "", - "prefix": "/usr/local/Cellar/node/7.10.0" + "prefix": "/usr/local", + "link": "" } } diff --git a/nodejs/node_modules/lame/build/deps/lame/lamevectorroutines.target.mk b/nodejs/node_modules/lame/build/deps/lame/lamevectorroutines.target.mk index 4f6c93207..12d266ff3 100644 --- a/nodejs/node_modules/lame/build/deps/lame/lamevectorroutines.target.mk +++ b/nodejs/node_modules/lame/build/deps/lame/lamevectorroutines.target.mk @@ -13,7 +13,8 @@ DEFS_Debug := \ '-D_LARGEFILE_SOURCE' \ '-D_FILE_OFFSET_BITS=64' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -50,10 +51,10 @@ INCS_Debug := \ -I$(srcdir)/deps/lame/libmp3lame \ -I$(srcdir)/deps/lame/libmp3lame/vector \ -I$(srcdir)/deps/lame/config/mac/x64 \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include DEFS_Release := \ '-DPIC' \ @@ -102,10 +103,10 @@ INCS_Release := \ -I$(srcdir)/deps/lame/libmp3lame \ -I$(srcdir)/deps/lame/libmp3lame/vector \ -I$(srcdir)/deps/lame/config/mac/x64 \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include OBJS := \ $(obj).target/$(TARGET)/deps/lame/libmp3lame/vector/xmm_quantize_sub.o diff --git a/nodejs/node_modules/lame/build/deps/lame/mp3lame.target.mk b/nodejs/node_modules/lame/build/deps/lame/mp3lame.target.mk index a0bcfd248..cca26efb4 100644 --- a/nodejs/node_modules/lame/build/deps/lame/mp3lame.target.mk +++ b/nodejs/node_modules/lame/build/deps/lame/mp3lame.target.mk @@ -13,7 +13,8 @@ DEFS_Debug := \ '-D_LARGEFILE_SOURCE' \ '-D_FILE_OFFSET_BITS=64' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -50,10 +51,10 @@ INCS_Debug := \ -I$(srcdir)/deps/lame/libmp3lame \ -I$(srcdir)/deps/lame/libmp3lame/vector \ -I$(srcdir)/deps/lame/config/mac/x64 \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include DEFS_Release := \ '-DPIC' \ @@ -102,10 +103,10 @@ INCS_Release := \ -I$(srcdir)/deps/lame/libmp3lame \ -I$(srcdir)/deps/lame/libmp3lame/vector \ -I$(srcdir)/deps/lame/config/mac/x64 \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include OBJS := \ $(obj).target/$(TARGET)/deps/lame/libmp3lame/VbrTag.o \ diff --git a/nodejs/node_modules/lame/build/deps/lame/test.target.mk b/nodejs/node_modules/lame/build/deps/lame/test.target.mk index 4c476c573..3682d658b 100644 --- a/nodejs/node_modules/lame/build/deps/lame/test.target.mk +++ b/nodejs/node_modules/lame/build/deps/lame/test.target.mk @@ -13,7 +13,8 @@ DEFS_Debug := \ '-D_LARGEFILE_SOURCE' \ '-D_FILE_OFFSET_BITS=64' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -50,10 +51,10 @@ INCS_Debug := \ -I$(srcdir)/deps/lame/libmp3lame \ -I$(srcdir)/deps/lame/libmp3lame/vector \ -I$(srcdir)/deps/lame/config/mac/x64 \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include DEFS_Release := \ '-DPIC' \ @@ -102,10 +103,10 @@ INCS_Release := \ -I$(srcdir)/deps/lame/libmp3lame \ -I$(srcdir)/deps/lame/libmp3lame/vector \ -I$(srcdir)/deps/lame/config/mac/x64 \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include OBJS := \ $(obj).target/$(TARGET)/deps/lame/test.o diff --git a/nodejs/node_modules/lame/build/deps/mpg123/mpg123.target.mk b/nodejs/node_modules/lame/build/deps/mpg123/mpg123.target.mk index 3c246ed43..4f8303d91 100644 --- a/nodejs/node_modules/lame/build/deps/mpg123/mpg123.target.mk +++ b/nodejs/node_modules/lame/build/deps/mpg123/mpg123.target.mk @@ -16,7 +16,8 @@ DEFS_Debug := \ '-DOPT_X86_64' \ '-DREAL_IS_FLOAT' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -49,10 +50,10 @@ CFLAGS_OBJC_Debug := CFLAGS_OBJCC_Debug := INCS_Debug := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/deps/mpg123/src/libmpg123 \ -I$(srcdir)/deps/mpg123/config/mac/x64 @@ -102,10 +103,10 @@ CFLAGS_OBJC_Release := CFLAGS_OBJCC_Release := INCS_Release := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/deps/mpg123/src/libmpg123 \ -I$(srcdir)/deps/mpg123/config/mac/x64 diff --git a/nodejs/node_modules/lame/build/deps/mpg123/output.target.mk b/nodejs/node_modules/lame/build/deps/mpg123/output.target.mk index 33edc7c6c..2ef29c1e2 100644 --- a/nodejs/node_modules/lame/build/deps/mpg123/output.target.mk +++ b/nodejs/node_modules/lame/build/deps/mpg123/output.target.mk @@ -16,7 +16,8 @@ DEFS_Debug := \ '-DHAVE_CONFIG_H' \ '-DBUILDING_OUTPUT_MODULES=1' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -49,10 +50,10 @@ CFLAGS_OBJC_Debug := CFLAGS_OBJCC_Debug := INCS_Debug := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/deps/mpg123/src \ -I$(srcdir)/deps/mpg123/src/output \ -I$(srcdir)/deps/mpg123/src/libmpg123 \ @@ -104,10 +105,10 @@ CFLAGS_OBJC_Release := CFLAGS_OBJCC_Release := INCS_Release := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/deps/mpg123/src \ -I$(srcdir)/deps/mpg123/src/output \ -I$(srcdir)/deps/mpg123/src/libmpg123 \ diff --git a/nodejs/node_modules/lame/build/deps/mpg123/output_test.target.mk b/nodejs/node_modules/lame/build/deps/mpg123/output_test.target.mk index 327157efa..e0872b086 100644 --- a/nodejs/node_modules/lame/build/deps/mpg123/output_test.target.mk +++ b/nodejs/node_modules/lame/build/deps/mpg123/output_test.target.mk @@ -11,7 +11,8 @@ DEFS_Debug := \ '-D_LARGEFILE_SOURCE' \ '-D_FILE_OFFSET_BITS=64' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -44,10 +45,10 @@ CFLAGS_OBJC_Debug := CFLAGS_OBJCC_Debug := INCS_Debug := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/deps/mpg123/src \ -I$(srcdir)/deps/mpg123/src/output \ -I$(srcdir)/deps/mpg123/src/libmpg123 \ @@ -94,10 +95,10 @@ CFLAGS_OBJC_Release := CFLAGS_OBJCC_Release := INCS_Release := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/deps/mpg123/src \ -I$(srcdir)/deps/mpg123/src/output \ -I$(srcdir)/deps/mpg123/src/libmpg123 \ diff --git a/nodejs/node_modules/lame/build/deps/mpg123/test.target.mk b/nodejs/node_modules/lame/build/deps/mpg123/test.target.mk index fe82440bc..195a97593 100644 --- a/nodejs/node_modules/lame/build/deps/mpg123/test.target.mk +++ b/nodejs/node_modules/lame/build/deps/mpg123/test.target.mk @@ -11,7 +11,8 @@ DEFS_Debug := \ '-D_LARGEFILE_SOURCE' \ '-D_FILE_OFFSET_BITS=64' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -44,10 +45,10 @@ CFLAGS_OBJC_Debug := CFLAGS_OBJCC_Debug := INCS_Debug := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/deps/mpg123/src/libmpg123 \ -I$(srcdir)/deps/mpg123/config/mac/x64 @@ -92,10 +93,10 @@ CFLAGS_OBJC_Release := CFLAGS_OBJCC_Release := INCS_Release := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/deps/mpg123/src/libmpg123 \ -I$(srcdir)/deps/mpg123/config/mac/x64 diff --git a/nodejs/node_modules/lame/package.json b/nodejs/node_modules/lame/package.json index bd65eaa99..693ffc9dc 100644 --- a/nodejs/node_modules/lame/package.json +++ b/nodejs/node_modules/lame/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "lame@^1.1.1", - "scope": null, - "escapedName": "lame", - "name": "lame", - "rawSpec": "^1.1.1", - "spec": ">=1.1.1 <2.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio" + "lame@1.2.4", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "lame@>=1.1.1 <2.0.0", + "_from": "lame@1.2.4", "_id": "lame@1.2.4", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-VGgBUU4t6MoMie7yIogMjcZxJIU=", "_location": "/lame", - "_nodeVersion": "6.2.0", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/lame-1.2.4.tgz_1467004820762_0.4870841265656054" - }, - "_npmUser": { - "name": "linusu", - "email": "linus@folkdatorn.se" - }, - "_npmVersion": "3.8.9", "_phantomChildren": {}, "_requested": { - "raw": "lame@^1.1.1", - "scope": null, - "escapedName": "lame", + "type": "version", + "registry": true, + "raw": "lame@1.2.4", "name": "lame", - "rawSpec": "^1.1.1", - "spec": ">=1.1.1 <2.0.0", - "type": "range" + "escapedName": "lame", + "rawSpec": "1.2.4", + "saveSpec": null, + "fetchSpec": "1.2.4" }, "_requiredBy": [ "/webcast-osx-audio" ], "_resolved": "https://registry.npmjs.org/lame/-/lame-1.2.4.tgz", - "_shasum": "546801514e2de8ca0c89eef222880c8dc6712485", - "_shrinkwrap": null, - "_spec": "lame@^1.1.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio", + "_spec": "1.2.4", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", @@ -63,12 +45,6 @@ "devDependencies": { "mocha": "^2.4.5" }, - "directories": {}, - "dist": { - "shasum": "546801514e2de8ca0c89eef222880c8dc6712485", - "tarball": "https://registry.npmjs.org/lame/-/lame-1.2.4.tgz" - }, - "gitHead": "892d9097d01197d28946f5dd1fee1c7bf6bae018", "gypfile": true, "homepage": "https://github.com/TooTallNate/node-lame#readme", "keywords": [ @@ -82,23 +58,7 @@ ], "license": "MIT", "main": "./index.js", - "maintainers": [ - { - "name": "TooTallNate", - "email": "nathan@tootallnate.net" - }, - { - "name": "linusu", - "email": "linus@folkdatorn.se" - }, - { - "name": "tootallnate", - "email": "nathan@tootallnate.net" - } - ], "name": "lame", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/TooTallNate/node-lame.git" diff --git a/nodejs/node_modules/media-typer/package.json b/nodejs/node_modules/media-typer/package.json index d760aba4d..c455b4173 100644 --- a/nodejs/node_modules/media-typer/package.json +++ b/nodejs/node_modules/media-typer/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "media-typer@0.3.0", - "scope": null, - "escapedName": "media-typer", - "name": "media-typer", - "rawSpec": "0.3.0", - "spec": "0.3.0", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/type-is" + "media-typer@0.3.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "media-typer@0.3.0", "_id": "media-typer@0.3.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "_location": "/media-typer", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.21", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "media-typer@0.3.0", - "scope": null, - "escapedName": "media-typer", "name": "media-typer", + "escapedName": "media-typer", "rawSpec": "0.3.0", - "spec": "0.3.0", - "type": "version" + "saveSpec": null, + "fetchSpec": "0.3.0" }, "_requiredBy": [ "/type-is" ], "_resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "_shasum": "8710d7af0aa626f8fffa1ce00168545263255748", - "_shrinkwrap": null, - "_spec": "media-typer@0.3.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/type-is", + "_spec": "0.3.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" @@ -47,18 +34,12 @@ "bugs": { "url": "https://github.com/jshttp/media-typer/issues" }, - "dependencies": {}, "description": "Simple RFC 6838 media type parser and formatter", "devDependencies": { "istanbul": "0.3.2", "mocha": "~1.21.4", "should": "~4.0.4" }, - "directories": {}, - "dist": { - "shasum": "8710d7af0aa626f8fffa1ce00168545263255748", - "tarball": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -67,18 +48,9 @@ "HISTORY.md", "index.js" ], - "gitHead": "d49d41ffd0bb5a0655fa44a59df2ec0bfc835b16", - "homepage": "https://github.com/jshttp/media-typer", + "homepage": "https://github.com/jshttp/media-typer#readme", "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "media-typer", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/media-typer.git" diff --git a/nodejs/node_modules/merge-descriptors/package.json b/nodejs/node_modules/merge-descriptors/package.json index ff014a784..90713bcc8 100644 --- a/nodejs/node_modules/merge-descriptors/package.json +++ b/nodejs/node_modules/merge-descriptors/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "merge-descriptors@1.0.1", - "scope": null, - "escapedName": "merge-descriptors", - "name": "merge-descriptors", - "rawSpec": "1.0.1", - "spec": "1.0.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "merge-descriptors@1.0.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "merge-descriptors@1.0.1", "_id": "merge-descriptors@1.0.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "_location": "/merge-descriptors", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "merge-descriptors@1.0.1", - "scope": null, - "escapedName": "merge-descriptors", "name": "merge-descriptors", + "escapedName": "merge-descriptors", "rawSpec": "1.0.1", - "spec": "1.0.1", - "type": "version" + "saveSpec": null, + "fetchSpec": "1.0.1" }, "_requiredBy": [ "/express" ], "_resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "_shasum": "b00aaa556dd8b44568150ec9d1b953f3f90cbb61", - "_shrinkwrap": null, - "_spec": "merge-descriptors@1.0.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.0.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Jonathan Ong", "email": "me@jongleberry.com", @@ -58,107 +45,20 @@ "email": "grabbou@gmail.com" } ], - "dependencies": {}, "description": "Merge objects using descriptors", "devDependencies": { "istanbul": "0.4.1", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "b00aaa556dd8b44568150ec9d1b953f3f90cbb61", - "tarball": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" - }, "files": [ "HISTORY.md", "LICENSE", "README.md", "index.js" ], - "gitHead": "f26c49c3b423b0b2ac31f6e32a84e1632f2d7ac2", - "homepage": "https://github.com/component/merge-descriptors", + "homepage": "https://github.com/component/merge-descriptors#readme", "license": "MIT", - "maintainers": [ - { - "name": "anthonyshort", - "email": "antshort@gmail.com" - }, - { - "name": "clintwood", - "email": "clint@anotherway.co.za" - }, - { - "name": "dfcreative", - "email": "df.creative@gmail.com" - }, - { - "name": "dominicbarnes", - "email": "dominic@dbarnes.info" - }, - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "ianstormtaylor", - "email": "ian@ianstormtaylor.com" - }, - { - "name": "jonathanong", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "juliangruber", - "email": "julian@juliangruber.com" - }, - { - "name": "mattmueller", - "email": "mattmuelle@gmail.com" - }, - { - "name": "queckezz", - "email": "fabian.eichenberger@gmail.com" - }, - { - "name": "stephenmathieson", - "email": "me@stephenmathieson.com" - }, - { - "name": "thehydroimpulse", - "email": "dnfagnan@gmail.com" - }, - { - "name": "timaschew", - "email": "timaschew@gmail.com" - }, - { - "name": "timoxley", - "email": "secoif@gmail.com" - }, - { - "name": "tjholowaychuk", - "email": "tj@vision-media.ca" - }, - { - "name": "tootallnate", - "email": "nathan@tootallnate.net" - }, - { - "name": "trevorgerhardt", - "email": "trevorgerhardt@gmail.com" - }, - { - "name": "yields", - "email": "yields@icloud.com" - } - ], "name": "merge-descriptors", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/component/merge-descriptors.git" diff --git a/nodejs/node_modules/methods/package.json b/nodejs/node_modules/methods/package.json index 48f9c9ace..9f9771876 100644 --- a/nodejs/node_modules/methods/package.json +++ b/nodejs/node_modules/methods/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "methods@~1.1.2", - "scope": null, - "escapedName": "methods", - "name": "methods", - "rawSpec": "~1.1.2", - "spec": ">=1.1.2 <1.2.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "methods@1.1.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "methods@>=1.1.2 <1.2.0", + "_from": "methods@1.1.2", "_id": "methods@1.1.2", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", "_location": "/methods", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "methods@~1.1.2", - "scope": null, - "escapedName": "methods", + "type": "version", + "registry": true, + "raw": "methods@1.1.2", "name": "methods", - "rawSpec": "~1.1.2", - "spec": ">=1.1.2 <1.2.0", - "type": "range" + "escapedName": "methods", + "rawSpec": "1.1.2", + "saveSpec": null, + "fetchSpec": "1.1.2" }, "_requiredBy": [ "/express" ], "_resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "_shasum": "5529a4d67654134edcc5266656835b0f851afcee", - "_shrinkwrap": null, - "_spec": "methods@~1.1.2", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.1.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "browser": { "http": false }, @@ -62,17 +49,11 @@ "url": "http://tjholowaychuk.com" } ], - "dependencies": {}, "description": "HTTP methods that node supports", "devDependencies": { "istanbul": "0.4.1", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "5529a4d67654134edcc5266656835b0f851afcee", - "tarball": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -81,34 +62,13 @@ "HISTORY.md", "LICENSE" ], - "gitHead": "25d257d913f1b94bd2d73581521ff72c81469140", - "homepage": "https://github.com/jshttp/methods", + "homepage": "https://github.com/jshttp/methods#readme", "keywords": [ "http", "methods" ], "license": "MIT", - "maintainers": [ - { - "name": "tjholowaychuk", - "email": "tj@vision-media.ca" - }, - { - "name": "jonathanong", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "methods", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/methods.git" diff --git a/nodejs/node_modules/mime-db/HISTORY.md b/nodejs/node_modules/mime-db/HISTORY.md index 8e4d41318..b2870c40e 100644 --- a/nodejs/node_modules/mime-db/HISTORY.md +++ b/nodejs/node_modules/mime-db/HISTORY.md @@ -1,160 +1,91 @@ +1.30.0 / 2017-08-27 +=================== + + * Add `application/vnd.ms-outlook` + * Add `application/x-arj` + * Add extension `.mjs` to `application/javascript` + * Add glTF types and extensions + * Add new upstream MIME types + * Add `text/x-org` + * Add VirtualBox MIME types + * Fix `source` records for `video/*` types that are IANA + * Update `font/opentype` to registered `font/otf` + +1.29.0 / 2017-07-10 +=================== + + * Add `application/fido.trusted-apps+json` + * Add extension `.wadl` to `application/vnd.sun.wadl+xml` + * Add new upstream MIME types + * Add `UTF-8` as default charset for `text/css` + +1.28.0 / 2017-05-14 +=================== + + * Add new upstream MIME types + * Add extension `.gz` to `application/gzip` + * Update extensions `.md` and `.markdown` to be `text/markdown` + 1.27.0 / 2017-03-16 =================== - * Add `application/emergencycalldata.control+xml` - * Add `application/emergencycalldata.ecall.msd` - * Add `application/emergencycalldata.veds+xml` - * Add `application/geo+json-seq` - * Add `application/n-quads` - * Add `application/n-triples` - * Add `application/vnd.apothekende.reservation+json` - * Add `application/vnd.efi.img` - * Add `application/vnd.efi.iso` - * Add `application/vnd.imagemeter.image+zip` - * Add `application/vnd.las.las+json` - * Add `application/vnd.ocf+cbor` - * Add `audio/melp` - * Add `audio/melp1200` - * Add `audio/melp2400` - * Add `audio/melp600` + * Add new upstream MIME types * Add `image/apng` with extension `.apng` 1.26.0 / 2017-01-14 =================== - * Add `application/coap-payload` - * Add `application/cose` - * Add `application/cose-key` - * Add `application/cose-key-set` - * Add `application/mud+json` - * Add `application/trig` - * Add `application/vnd.dataresource+json` - * Add `application/vnd.hc+json` - * Add `application/vnd.tableschema+json` - * Add `application/yang-patch+json` - * Add `application/yang-patch+xml` + * Add new upstream MIME types * Add extension `.geojson` to `application/geo+json` 1.25.0 / 2016-11-11 =================== - * Add `application/dicom+json` - * Add `application/dicom+xml` - * Add `application/vnd.openstreetmap.data+xml` - * Add `application/vnd.tri.onesource` - * Add `application/yang-data+json` - * Add `application/yang-data+xml` + * Add new upstream MIME types 1.24.0 / 2016-09-18 =================== - * Add `application/clue_info+xml` - * Add `application/geo+json` - * Add `application/lgr+xml` - * Add `application/vnd.amazon.mobi8-ebook` - * Add `application/vnd.chess-pgn` - * Add `application/vnd.comicbook+zip` - * Add `application/vnd.d2l.coursepackage1p0+zip` - * Add `application/vnd.espass-espass+zip` - * Add `application/vnd.nearst.inv+json` - * Add `application/vnd.oma.lwm2m+json` - * Add `application/vnd.oma.lwm2m+tlv` - * Add `application/vnd.quarantainenet` - * Add `application/vnd.rar` * Add `audio/mp3` - * Add `image/dicom-rle` - * Add `image/emf` - * Add `image/jls` - * Add `image/wmf` - * Add `model/gltf+json` - * Add `text/vnd.ascii-art` + * Add new upstream MIME types 1.23.0 / 2016-05-01 =================== - * Add `application/efi` - * Add `application/vnd.3gpp.sms+xml` - * Add `application/vnd.3lightssoftware.imagescal` - * Add `application/vnd.coreos.ignition+json` - * Add `application/vnd.desmume.movie` - * Add `application/vnd.onepager` - * Add `application/vnd.vel+json` - * Add `text/prs.prop.logic` - * Add `video/encaprtp` - * Add `video/h265` - * Add `video/iso.segment` - * Add `video/raptorfec` - * Add `video/rtploopback` - * Add `video/vnd.radgamettools.bink` - * Add `video/vnd.radgamettools.smacker` - * Add `video/vp8` + * Add new upstream MIME types * Add extension `.3gpp` to `audio/3gpp` 1.22.0 / 2016-02-15 =================== - * Add `application/ppsp-tracker+json` - * Add `application/problem+json` - * Add `application/problem+xml` - * Add `application/vnd.hdt` - * Add `application/vnd.ms-printschematicket+xml` - * Add `model/vnd.rosette.annotated-data-model` * Add `text/slim` * Add extension `.rng` to `application/xml` + * Add new upstream MIME types * Fix extension of `application/dash+xml` to be `.mpd` * Update primary extension to `.m4a` for `audio/mp4` 1.21.0 / 2016-01-06 =================== - * Add `application/emergencycalldata.comment+xml` - * Add `application/emergencycalldata.deviceinfo+xml` - * Add `application/emergencycalldata.providerinfo+xml` - * Add `application/emergencycalldata.serviceinfo+xml` - * Add `application/emergencycalldata.subscriberinfo+xml` - * Add `application/vnd.filmit.zfc` - * Add `application/vnd.google-apps.document` - * Add `application/vnd.google-apps.presentation` - * Add `application/vnd.google-apps.spreadsheet` - * Add `application/vnd.mapbox-vector-tile` - * Add `application/vnd.ms-printdevicecapabilities+xml` - * Add `application/vnd.ms-windows.devicepairing` - * Add `application/vnd.ms-windows.nwprinting.oob` - * Add `application/vnd.tml` - * Add `audio/evs` + * Add Google document types + * Add new upstream MIME types 1.20.0 / 2015-11-10 =================== - * Add `application/cdni` - * Add `application/csvm+json` - * Add `application/rfc+xml` - * Add `application/vnd.3gpp.access-transfer-events+xml` - * Add `application/vnd.3gpp.srvcc-ext+xml` - * Add `application/vnd.ms-windows.wsd.oob` - * Add `application/vnd.oxli.countgraph` - * Add `application/vnd.pagerduty+json` * Add `text/x-suse-ymp` + * Add new upstream MIME types 1.19.0 / 2015-09-17 =================== - * Add `application/vnd.3gpp-prose-pc3ch+xml` - * Add `application/vnd.3gpp.srvcc-info+xml` * Add `application/vnd.apple.pkpass` - * Add `application/vnd.drive+json` + * Add new upstream MIME types 1.18.0 / 2015-09-03 =================== - * Add `application/pkcs12` - * Add `application/vnd.3gpp-prose+xml` - * Add `application/vnd.3gpp.mid-call+xml` - * Add `application/vnd.3gpp.state-and-event-info+xml` - * Add `application/vnd.anki` - * Add `application/vnd.firemonkeys.cloudcell` - * Add `application/vnd.openblox.game+xml` - * Add `application/vnd.openblox.game-binary` + * Add new upstream MIME types 1.17.0 / 2015-08-13 =================== diff --git a/nodejs/node_modules/mime-db/README.md b/nodejs/node_modules/mime-db/README.md index 7662440bb..320c1c925 100644 --- a/nodejs/node_modules/mime-db/README.md +++ b/nodejs/node_modules/mime-db/README.md @@ -62,6 +62,18 @@ If unknown, every property could be `undefined`. To edit the database, only make PRs against `src/custom.json` or `src/custom-suffix.json`. +The `src/custom.json` file is a JSON object with the MIME type as the keys +and the values being an object with the following keys: + +- `compressible` - leave out if you don't know, otherwise `true`/`false` for + if the data represented by the time is typically compressible. +- `extensions` - include an array of file extensions that are associated with + the type. +- `notes` - human-readable notes about the type, typically what the type is. +- `sources` - include an array of URLs of where the MIME type and the associated + extensions are sourced from. This needs to be a [primary source](https://en.wikipedia.org/wiki/Primary_source); + links to type aggregating sites and Wikipedia are _not acceptible_. + To update the build, run `npm run build`. ## Adding Custom Media Types diff --git a/nodejs/node_modules/mime-db/db.json b/nodejs/node_modules/mime-db/db.json index 2c5151790..0fc2a72fd 100644 --- a/nodejs/node_modules/mime-db/db.json +++ b/nodejs/node_modules/mime-db/db.json @@ -128,6 +128,9 @@ "application/cbor": { "source": "iana" }, + "application/cccex": { + "source": "iana" + }, "application/ccmp+xml": { "source": "iana" }, @@ -366,6 +369,9 @@ "application/fdt+xml": { "source": "iana" }, + "application/fido.trusted-apps+json": { + "compressible": true + }, "application/fits": { "source": "iana" }, @@ -396,6 +402,9 @@ "application/geo+json-seq": { "source": "iana" }, + "application/geoxacml+xml": { + "source": "iana" + }, "application/gml+xml": { "source": "iana", "extensions": ["gml"] @@ -410,7 +419,8 @@ }, "application/gzip": { "source": "iana", - "compressible": false + "compressible": false, + "extensions": ["gz"] }, "application/h224": { "source": "iana" @@ -494,7 +504,11 @@ "source": "iana", "charset": "UTF-8", "compressible": true, - "extensions": ["js"] + "extensions": ["js","mjs"] + }, + "application/jf2feed+json": { + "source": "iana", + "compressible": true }, "application/jose": { "source": "iana" @@ -680,6 +694,9 @@ "application/mikey": { "source": "iana" }, + "application/mmt-usd+xml": { + "source": "iana" + }, "application/mods+xml": { "source": "iana", "extensions": ["mods"] @@ -807,6 +824,9 @@ "application/parityfec": { "source": "iana" }, + "application/passport": { + "source": "iana" + }, "application/patch-ops-error+xml": { "source": "iana", "extensions": ["xer"] @@ -983,6 +1003,15 @@ "source": "iana", "extensions": ["rs"] }, + "application/route-apd+xml": { + "source": "iana" + }, + "application/route-s-tsid+xml": { + "source": "iana" + }, + "application/route-usd+xml": { + "source": "iana" + }, "application/rpki-ghostbusters": { "source": "iana", "extensions": ["gbr"] @@ -991,6 +1020,9 @@ "source": "iana", "extensions": ["mft"] }, + "application/rpki-publication": { + "source": "iana" + }, "application/rpki-roa": { "source": "iana", "extensions": ["roa"] @@ -1245,6 +1277,9 @@ "application/vividence.scriptfile": { "source": "apache" }, + "application/vnd.1000minds.decision-model+xml": { + "source": "iana" + }, "application/vnd.3gpp-prose+xml": { "source": "iana" }, @@ -1257,6 +1292,15 @@ "application/vnd.3gpp.bsf+xml": { "source": "iana" }, + "application/vnd.3gpp.gmop+xml": { + "source": "iana" + }, + "application/vnd.3gpp.mcptt-info+xml": { + "source": "iana" + }, + "application/vnd.3gpp.mcptt-mbms-usage-info+xml": { + "source": "iana" + }, "application/vnd.3gpp.mid-call+xml": { "source": "iana" }, @@ -1468,9 +1512,15 @@ "source": "iana", "compressible": true }, + "application/vnd.bint.med-content": { + "source": "iana" + }, "application/vnd.biopax.rdf+xml": { "source": "iana" }, + "application/vnd.blink-idb-value-wrapper": { + "source": "iana" + }, "application/vnd.blueice.multipass": { "source": "iana", "extensions": ["mpm"] @@ -1498,6 +1548,10 @@ "application/vnd.canon-lips": { "source": "iana" }, + "application/vnd.capasystems-pg+json": { + "source": "iana", + "compressible": true + }, "application/vnd.cendio.thinlinc.clientconf": { "source": "iana" }, @@ -1658,6 +1712,10 @@ "source": "iana", "extensions": ["rdz"] }, + "application/vnd.datapackage+json": { + "source": "iana", + "compressible": true + }, "application/vnd.dataresource+json": { "source": "iana", "compressible": true @@ -1955,6 +2013,15 @@ "application/vnd.eudora.data": { "source": "iana" }, + "application/vnd.evolv.ecig.profile": { + "source": "iana" + }, + "application/vnd.evolv.ecig.settings": { + "source": "iana" + }, + "application/vnd.evolv.ecig.theme": { + "source": "iana" + }, "application/vnd.ezpix-album": { "source": "iana", "extensions": ["ez2"] @@ -2250,6 +2317,10 @@ "source": "iana", "extensions": ["sfd-hdstx"] }, + "application/vnd.hyper-item+json": { + "source": "iana", + "compressible": true + }, "application/vnd.hyperdrive+json": { "source": "iana", "compressible": true @@ -2290,6 +2361,9 @@ "source": "iana", "extensions": ["igl"] }, + "application/vnd.imagemeter.folder+zip": { + "source": "iana" + }, "application/vnd.imagemeter.image+zip": { "source": "iana" }, @@ -2622,6 +2696,9 @@ "application/vnd.microsoft.portable-executable": { "source": "iana" }, + "application/vnd.microsoft.windows.thumbnail-cache": { + "source": "iana" + }, "application/vnd.miele+json": { "source": "iana", "compressible": true @@ -2767,6 +2844,10 @@ "source": "apache", "compressible": true }, + "application/vnd.ms-outlook": { + "compressible": false, + "extensions": ["msg"] + }, "application/vnd.ms-package.obfuscated-opentype": { "source": "apache" }, @@ -3266,6 +3347,21 @@ "application/vnd.onepager": { "source": "iana" }, + "application/vnd.onepagertamp": { + "source": "iana" + }, + "application/vnd.onepagertamx": { + "source": "iana" + }, + "application/vnd.onepagertat": { + "source": "iana" + }, + "application/vnd.onepagertatp": { + "source": "iana" + }, + "application/vnd.onepagertatx": { + "source": "iana" + }, "application/vnd.openblox.game+xml": { "source": "iana" }, @@ -3838,6 +3934,9 @@ "source": "iana", "extensions": ["ipk"] }, + "application/vnd.sigrok.session": { + "source": "iana" + }, "application/vnd.simtech-mindmapper": { "source": "iana", "extensions": ["twd","twds"] @@ -3920,7 +4019,9 @@ "source": "iana" }, "application/vnd.sun.wadl+xml": { - "source": "iana" + "source": "iana", + "compressible": true, + "extensions": ["wadl"] }, "application/vnd.sun.xml.calc": { "source": "apache", @@ -4364,6 +4465,10 @@ "source": "apache", "extensions": ["dmg"] }, + "application/x-arj": { + "compressible": false, + "extensions": ["arj"] + }, "application/x-authorware-bin": { "source": "apache", "extensions": ["aab","x32","u32","vox"] @@ -4827,6 +4932,38 @@ "source": "apache", "extensions": ["ustar"] }, + "application/x-virtualbox-hdd": { + "compressible": true, + "extensions": ["hdd"] + }, + "application/x-virtualbox-ova": { + "compressible": true, + "extensions": ["ova"] + }, + "application/x-virtualbox-ovf": { + "compressible": true, + "extensions": ["ovf"] + }, + "application/x-virtualbox-vbox": { + "compressible": true, + "extensions": ["vbox"] + }, + "application/x-virtualbox-vbox-extpack": { + "compressible": false, + "extensions": ["vbox-extpack"] + }, + "application/x-virtualbox-vdi": { + "compressible": true, + "extensions": ["vdi"] + }, + "application/x-virtualbox-vhd": { + "compressible": true, + "extensions": ["vhd"] + }, + "application/x-virtualbox-vmdk": { + "compressible": true, + "extensions": ["vmdk"] + }, "application/x-wais-source": { "source": "apache", "extensions": ["src"] @@ -5445,6 +5582,9 @@ "audio/vnd.octel.sbc": { "source": "iana" }, + "audio/vnd.presonus.multitrack": { + "source": "iana" + }, "audio/vnd.qcelp": { "source": "iana" }, @@ -5575,7 +5715,7 @@ "source": "apache", "extensions": ["xyz"] }, - "font/opentype": { + "font/otf": { "compressible": true, "extensions": ["otf"] }, @@ -5936,9 +6076,17 @@ "message/vnd.wfa.wsc": { "source": "iana" }, + "model/3mf": { + "source": "iana" + }, "model/gltf+json": { "source": "iana", - "compressible": true + "compressible": true, + "extensions": ["gltf"] + }, + "model/gltf-binary": { + "compressible": true, + "extensions": ["glb"] }, "model/iges": { "source": "iana", @@ -6069,6 +6217,9 @@ "source": "iana", "compressible": false }, + "multipart/vnd.bint.med-plus": { + "source": "iana" + }, "multipart/voice-message": { "source": "iana" }, @@ -6098,6 +6249,7 @@ }, "text/css": { "source": "iana", + "charset": "UTF-8", "compressible": true, "extensions": ["css"] }, @@ -6156,7 +6308,9 @@ "extensions": ["less"] }, "text/markdown": { - "source": "iana" + "source": "iana", + "compressible": true, + "extensions": ["markdown","md"] }, "text/mathml": { "source": "nginx", @@ -6229,6 +6383,9 @@ "text/slim": { "extensions": ["slim","slm"] }, + "text/strings": { + "source": "iana" + }, "text/stylus": { "extensions": ["stylus","styl"] }, @@ -6403,7 +6560,7 @@ }, "text/x-markdown": { "compressible": true, - "extensions": ["markdown","md","mkd"] + "extensions": ["mkd"] }, "text/x-nfo": { "source": "apache", @@ -6413,6 +6570,10 @@ "source": "apache", "extensions": ["opml"] }, + "text/x-org": { + "compressible": true, + "extensions": ["org"] + }, "text/x-pascal": { "source": "apache", "extensions": ["p","pas"] @@ -6463,266 +6624,266 @@ "extensions": ["yaml","yml"] }, "video/1d-interleaved-parityfec": { - "source": "apache" + "source": "iana" }, "video/3gpp": { - "source": "apache", + "source": "iana", "extensions": ["3gp","3gpp"] }, "video/3gpp-tt": { - "source": "apache" + "source": "iana" }, "video/3gpp2": { - "source": "apache", + "source": "iana", "extensions": ["3g2"] }, "video/bmpeg": { - "source": "apache" + "source": "iana" }, "video/bt656": { - "source": "apache" + "source": "iana" }, "video/celb": { - "source": "apache" + "source": "iana" }, "video/dv": { - "source": "apache" + "source": "iana" }, "video/encaprtp": { - "source": "apache" + "source": "iana" }, "video/h261": { - "source": "apache", + "source": "iana", "extensions": ["h261"] }, "video/h263": { - "source": "apache", + "source": "iana", "extensions": ["h263"] }, "video/h263-1998": { - "source": "apache" + "source": "iana" }, "video/h263-2000": { - "source": "apache" + "source": "iana" }, "video/h264": { - "source": "apache", + "source": "iana", "extensions": ["h264"] }, "video/h264-rcdo": { - "source": "apache" + "source": "iana" }, "video/h264-svc": { - "source": "apache" + "source": "iana" }, "video/h265": { - "source": "apache" + "source": "iana" }, "video/iso.segment": { - "source": "apache" + "source": "iana" }, "video/jpeg": { - "source": "apache", + "source": "iana", "extensions": ["jpgv"] }, "video/jpeg2000": { - "source": "apache" + "source": "iana" }, "video/jpm": { "source": "apache", "extensions": ["jpm","jpgm"] }, "video/mj2": { - "source": "apache", + "source": "iana", "extensions": ["mj2","mjp2"] }, "video/mp1s": { - "source": "apache" + "source": "iana" }, "video/mp2p": { - "source": "apache" + "source": "iana" }, "video/mp2t": { - "source": "apache", + "source": "iana", "extensions": ["ts"] }, "video/mp4": { - "source": "apache", + "source": "iana", "compressible": false, "extensions": ["mp4","mp4v","mpg4"] }, "video/mp4v-es": { - "source": "apache" + "source": "iana" }, "video/mpeg": { - "source": "apache", + "source": "iana", "compressible": false, "extensions": ["mpeg","mpg","mpe","m1v","m2v"] }, "video/mpeg4-generic": { - "source": "apache" + "source": "iana" }, "video/mpv": { - "source": "apache" + "source": "iana" }, "video/nv": { - "source": "apache" + "source": "iana" }, "video/ogg": { - "source": "apache", + "source": "iana", "compressible": false, "extensions": ["ogv"] }, "video/parityfec": { - "source": "apache" + "source": "iana" }, "video/pointer": { - "source": "apache" + "source": "iana" }, "video/quicktime": { - "source": "apache", + "source": "iana", "compressible": false, "extensions": ["qt","mov"] }, "video/raptorfec": { - "source": "apache" + "source": "iana" }, "video/raw": { - "source": "apache" + "source": "iana" }, "video/rtp-enc-aescm128": { - "source": "apache" + "source": "iana" }, "video/rtploopback": { - "source": "apache" + "source": "iana" }, "video/rtx": { - "source": "apache" + "source": "iana" }, "video/smpte292m": { - "source": "apache" + "source": "iana" }, "video/ulpfec": { - "source": "apache" + "source": "iana" }, "video/vc1": { - "source": "apache" + "source": "iana" }, "video/vnd.cctv": { - "source": "apache" + "source": "iana" }, "video/vnd.dece.hd": { - "source": "apache", + "source": "iana", "extensions": ["uvh","uvvh"] }, "video/vnd.dece.mobile": { - "source": "apache", + "source": "iana", "extensions": ["uvm","uvvm"] }, "video/vnd.dece.mp4": { - "source": "apache" + "source": "iana" }, "video/vnd.dece.pd": { - "source": "apache", + "source": "iana", "extensions": ["uvp","uvvp"] }, "video/vnd.dece.sd": { - "source": "apache", + "source": "iana", "extensions": ["uvs","uvvs"] }, "video/vnd.dece.video": { - "source": "apache", + "source": "iana", "extensions": ["uvv","uvvv"] }, "video/vnd.directv.mpeg": { - "source": "apache" + "source": "iana" }, "video/vnd.directv.mpeg-tts": { - "source": "apache" + "source": "iana" }, "video/vnd.dlna.mpeg-tts": { - "source": "apache" + "source": "iana" }, "video/vnd.dvb.file": { - "source": "apache", + "source": "iana", "extensions": ["dvb"] }, "video/vnd.fvt": { - "source": "apache", + "source": "iana", "extensions": ["fvt"] }, "video/vnd.hns.video": { - "source": "apache" + "source": "iana" }, "video/vnd.iptvforum.1dparityfec-1010": { - "source": "apache" + "source": "iana" }, "video/vnd.iptvforum.1dparityfec-2005": { - "source": "apache" + "source": "iana" }, "video/vnd.iptvforum.2dparityfec-1010": { - "source": "apache" + "source": "iana" }, "video/vnd.iptvforum.2dparityfec-2005": { - "source": "apache" + "source": "iana" }, "video/vnd.iptvforum.ttsavc": { - "source": "apache" + "source": "iana" }, "video/vnd.iptvforum.ttsmpeg2": { - "source": "apache" + "source": "iana" }, "video/vnd.motorola.video": { - "source": "apache" + "source": "iana" }, "video/vnd.motorola.videop": { - "source": "apache" + "source": "iana" }, "video/vnd.mpegurl": { - "source": "apache", + "source": "iana", "extensions": ["mxu","m4u"] }, "video/vnd.ms-playready.media.pyv": { - "source": "apache", + "source": "iana", "extensions": ["pyv"] }, "video/vnd.nokia.interleaved-multimedia": { - "source": "apache" + "source": "iana" }, "video/vnd.nokia.videovoip": { - "source": "apache" + "source": "iana" }, "video/vnd.objectvideo": { - "source": "apache" + "source": "iana" }, "video/vnd.radgamettools.bink": { - "source": "apache" + "source": "iana" }, "video/vnd.radgamettools.smacker": { - "source": "apache" + "source": "iana" }, "video/vnd.sealed.mpeg1": { - "source": "apache" + "source": "iana" }, "video/vnd.sealed.mpeg4": { - "source": "apache" + "source": "iana" }, "video/vnd.sealed.swf": { - "source": "apache" + "source": "iana" }, "video/vnd.sealedmedia.softseal.mov": { - "source": "apache" + "source": "iana" }, "video/vnd.uvvu.mp4": { - "source": "apache", + "source": "iana", "extensions": ["uvu","uvvu"] }, "video/vnd.vivo": { - "source": "apache", + "source": "iana", "extensions": ["viv"] }, "video/vp8": { - "source": "apache" + "source": "iana" }, "video/webm": { "source": "apache", diff --git a/nodejs/node_modules/mime-db/package.json b/nodejs/node_modules/mime-db/package.json index 9ce528f2a..53830082b 100644 --- a/nodejs/node_modules/mime-db/package.json +++ b/nodejs/node_modules/mime-db/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "mime-db@~1.27.0", - "scope": null, - "escapedName": "mime-db", - "name": "mime-db", - "rawSpec": "~1.27.0", - "spec": ">=1.27.0 <1.28.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/mime-types" + "mime-db@1.30.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "mime-db@>=1.27.0 <1.28.0", - "_id": "mime-db@1.27.0", - "_inCache": true, + "_from": "mime-db@1.30.0", + "_id": "mime-db@1.30.0", + "_inBundle": false, + "_integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", "_location": "/mime-db", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/mime-db-1.27.0.tgz_1489722296902_0.15233952621929348" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "mime-db@~1.27.0", - "scope": null, - "escapedName": "mime-db", + "type": "version", + "registry": true, + "raw": "mime-db@1.30.0", "name": "mime-db", - "rawSpec": "~1.27.0", - "spec": ">=1.27.0 <1.28.0", - "type": "range" + "escapedName": "mime-db", + "rawSpec": "1.30.0", + "saveSpec": null, + "fetchSpec": "1.30.0" }, "_requiredBy": [ "/mime-types" ], - "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "_shasum": "820f572296bbd20ec25ed55e5b5de869e5436eb1", - "_shrinkwrap": null, - "_spec": "mime-db@~1.27.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/mime-types", + "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "_spec": "1.30.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/mime-db/issues" }, @@ -64,28 +46,24 @@ "url": "http://github.com/broofa" } ], - "dependencies": {}, "description": "Media Type Database", "devDependencies": { "bluebird": "3.5.0", "co": "4.6.0", "cogent": "1.0.1", - "csv-parse": "1.2.0", - "eslint": "3.17.1", - "eslint-config-standard": "7.0.1", + "csv-parse": "1.2.1", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-node": "5.1.1", "eslint-plugin-promise": "3.5.0", - "eslint-plugin-standard": "2.1.1", + "eslint-plugin-standard": "3.0.1", "gnode": "0.1.2", - "istanbul": "0.4.5", "mocha": "1.21.5", - "raw-body": "2.2.0", + "nyc": "11.1.0", + "raw-body": "2.3.0", "stream-to-array": "2.3.0" }, - "directories": {}, - "dist": { - "shasum": "820f572296bbd20ec25ed55e5b5de869e5436eb1", - "tarball": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -96,7 +74,6 @@ "db.json", "index.js" ], - "gitHead": "c232c21378647dfbb7762410c7b025a47f114b94", "homepage": "https://github.com/jshttp/mime-db#readme", "keywords": [ "mime", @@ -108,19 +85,7 @@ "charsets" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - } - ], "name": "mime-db", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/mime-db.git" @@ -130,9 +95,9 @@ "fetch": "gnode scripts/fetch-apache && gnode scripts/fetch-iana && gnode scripts/fetch-nginx", "lint": "eslint .", "test": "mocha --reporter spec --bail --check-leaks test/", - "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/", - "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/", + "test-cov": "nyc --reporter=html --reporter=text npm test", + "test-travis": "nyc --reporter=text npm test", "update": "npm run fetch && npm run build" }, - "version": "1.27.0" + "version": "1.30.0" } diff --git a/nodejs/node_modules/mime-types/HISTORY.md b/nodejs/node_modules/mime-types/HISTORY.md index b8008bc52..7517c11a7 100644 --- a/nodejs/node_modules/mime-types/HISTORY.md +++ b/nodejs/node_modules/mime-types/HISTORY.md @@ -1,3 +1,27 @@ +2.1.17 / 2017-09-01 +=================== + + * deps: mime-db@~1.30.0 + - Add `application/vnd.ms-outlook` + - Add `application/x-arj` + - Add extension `.mjs` to `application/javascript` + - Add glTF types and extensions + - Add new upstream MIME types + - Add `text/x-org` + - Add VirtualBox MIME types + - Fix `source` records for `video/*` types that are IANA + - Update `font/opentype` to registered `font/otf` + +2.1.16 / 2017-07-24 +=================== + + * deps: mime-db@~1.29.0 + - Add `application/fido.trusted-apps+json` + - Add extension `.wadl` to `application/vnd.sun.wadl+xml` + - Add extension `.gz` to `application/gzip` + - Add new upstream MIME types + - Update extensions `.md` and `.markdown` to be `text/markdown` + 2.1.15 / 2017-03-23 =================== diff --git a/nodejs/node_modules/mime-types/README.md b/nodejs/node_modules/mime-types/README.md index 4579db6e0..571031c90 100644 --- a/nodejs/node_modules/mime-types/README.md +++ b/nodejs/node_modules/mime-types/README.md @@ -48,7 +48,7 @@ Lookup the content-type associated with a file. ```js mime.lookup('json') // 'application/json' -mime.lookup('.md') // 'text/x-markdown' +mime.lookup('.md') // 'text/markdown' mime.lookup('file.html') // 'text/html' mime.lookup('folder/file.js') // 'application/javascript' mime.lookup('folder/.htaccess') // false @@ -81,7 +81,7 @@ mime.extension('application/octet-stream') // 'bin' Lookup the implied default charset of a content-type. ```js -mime.charset('text/x-markdown') // 'UTF-8' +mime.charset('text/markdown') // 'UTF-8' ``` ### var type = mime.types[extension] diff --git a/nodejs/node_modules/mime-types/index.js b/nodejs/node_modules/mime-types/index.js index 6e0ea4375..b9f34d599 100644 --- a/nodejs/node_modules/mime-types/index.js +++ b/nodejs/node_modules/mime-types/index.js @@ -20,8 +20,8 @@ var extname = require('path').extname * @private */ -var extractTypeRegExp = /^\s*([^;\s]*)(?:;|\s|$)/ -var textTypeRegExp = /^text\//i +var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/ +var TEXT_TYPE_REGEXP = /^text\//i /** * Module exports. @@ -52,7 +52,7 @@ function charset (type) { } // TODO: use media-typer - var match = extractTypeRegExp.exec(type) + var match = EXTRACT_TYPE_REGEXP.exec(type) var mime = match && db[match[1].toLowerCase()] if (mime && mime.charset) { @@ -60,7 +60,7 @@ function charset (type) { } // default text/* to utf-8 - if (match && textTypeRegExp.test(match[1])) { + if (match && TEXT_TYPE_REGEXP.test(match[1])) { return 'UTF-8' } @@ -110,7 +110,7 @@ function extension (type) { } // TODO: use media-typer - var match = extractTypeRegExp.exec(type) + var match = EXTRACT_TYPE_REGEXP.exec(type) // get extensions var exts = match && exports.extensions[match[1].toLowerCase()] diff --git a/nodejs/node_modules/mime-types/package.json b/nodejs/node_modules/mime-types/package.json index f8b7dc1c4..06342b140 100644 --- a/nodejs/node_modules/mime-types/package.json +++ b/nodejs/node_modules/mime-types/package.json @@ -1,51 +1,33 @@ { "_args": [ [ - { - "raw": "mime-types@~2.1.11", - "scope": null, - "escapedName": "mime-types", - "name": "mime-types", - "rawSpec": "~2.1.11", - "spec": ">=2.1.11 <2.2.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/accepts" + "mime-types@2.1.17", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "mime-types@>=2.1.11 <2.2.0", - "_id": "mime-types@2.1.15", - "_inCache": true, + "_from": "mime-types@2.1.17", + "_id": "mime-types@2.1.17", + "_inBundle": false, + "_integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", "_location": "/mime-types", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/mime-types-2.1.15.tgz_1490327753615_0.3609113476704806" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "mime-types@~2.1.11", - "scope": null, - "escapedName": "mime-types", + "type": "version", + "registry": true, + "raw": "mime-types@2.1.17", "name": "mime-types", - "rawSpec": "~2.1.11", - "spec": ">=2.1.11 <2.2.0", - "type": "range" + "escapedName": "mime-types", + "rawSpec": "2.1.17", + "saveSpec": null, + "fetchSpec": "2.1.17" }, "_requiredBy": [ "/accepts", "/type-is" ], - "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "_shasum": "a4ebf5064094569237b8cf70046776d09fc92aed", - "_shrinkwrap": null, - "_spec": "mime-types@~2.1.11", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/accepts", + "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "_spec": "2.1.17", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/mime-types/issues" }, @@ -66,22 +48,19 @@ } ], "dependencies": { - "mime-db": "~1.27.0" + "mime-db": "~1.30.0" }, "description": "The ultimate javascript content-type utility.", "devDependencies": { - "eslint": "3.18.0", - "eslint-config-standard": "7.1.0", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-node": "5.1.1", "eslint-plugin-promise": "3.5.0", - "eslint-plugin-standard": "2.1.1", + "eslint-plugin-standard": "3.0.1", "istanbul": "0.4.5", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "a4ebf5064094569237b8cf70046776d09fc92aed", - "tarball": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -90,30 +69,13 @@ "LICENSE", "index.js" ], - "gitHead": "c44863eb0463ee16f3eb04576591cc4c4d6b214c", "homepage": "https://github.com/jshttp/mime-types#readme", "keywords": [ "mime", "types" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "fishrock123", - "email": "fishrock123@rocketmail.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - } - ], "name": "mime-types", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/mime-types.git" @@ -124,5 +86,5 @@ "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot test/test.js", "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter dot test/test.js" }, - "version": "2.1.15" + "version": "2.1.17" } diff --git a/nodejs/node_modules/mime/.npmignore b/nodejs/node_modules/mime/.npmignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/nodejs/node_modules/mime/LICENSE b/nodejs/node_modules/mime/LICENSE index 451fc4550..d3f46f7e1 100644 --- a/nodejs/node_modules/mime/LICENSE +++ b/nodejs/node_modules/mime/LICENSE @@ -1,3 +1,5 @@ +The MIT License (MIT) + Copyright (c) 2010 Benjamin Thomas, Robert Kieffer Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/nodejs/node_modules/mime/build/test.js b/nodejs/node_modules/mime/build/test.js index 58b9ba7c8..010c42b98 100644 --- a/nodejs/node_modules/mime/build/test.js +++ b/nodejs/node_modules/mime/build/test.js @@ -43,15 +43,18 @@ assert.equal(undefined, mime.extension('unrecognized')); assert.equal('application/font-woff', mime.lookup('file.woff')); assert.equal('application/octet-stream', mime.lookup('file.buffer')); -assert.equal('audio/mp4', mime.lookup('file.m4a')); -assert.equal('font/opentype', mime.lookup('file.otf')); +// TODO: Uncomment once #157 is resolved +// assert.equal('audio/mp4', mime.lookup('file.m4a')); +assert.equal('font/otf', mime.lookup('file.otf')); // // Test charsets // assert.equal('UTF-8', mime.charsets.lookup('text/plain')); -assert.equal(undefined, mime.charsets.lookup(mime.types.js)); +assert.equal('UTF-8', mime.charsets.lookup(mime.types.js)); +assert.equal('UTF-8', mime.charsets.lookup(mime.types.json)); +assert.equal(undefined, mime.charsets.lookup(mime.types.bin)); assert.equal('fallback', mime.charsets.lookup('application/octet-stream', 'fallback')); console.log('\nAll tests passed'); diff --git a/nodejs/node_modules/mime/mime.js b/nodejs/node_modules/mime/mime.js index 341b6a5c4..d7efbde70 100644 --- a/nodejs/node_modules/mime/mime.js +++ b/nodejs/node_modules/mime/mime.js @@ -22,9 +22,9 @@ Mime.prototype.define = function (map) { for (var type in map) { var exts = map[type]; for (var i = 0; i < exts.length; i++) { - if (process.env.DEBUG_MIME && this.types[exts]) { - console.warn(this._loading.replace(/.*\//, ''), 'changes "' + exts[i] + '" extension type from ' + - this.types[exts] + ' to ' + type); + if (process.env.DEBUG_MIME && this.types[exts[i]]) { + console.warn((this._loading || "define()").replace(/.*\//, ''), 'changes "' + exts[i] + '" extension type from ' + + this.types[exts[i]] + ' to ' + type); } this.types[exts[i]] = type; @@ -67,7 +67,7 @@ Mime.prototype.load = function(file) { * Lookup a mime type based on extension */ Mime.prototype.lookup = function(path, fallback) { - var ext = path.replace(/.*[\.\/\\]/, '').toLowerCase(); + var ext = path.replace(/^.*[\.\/\\]/, '').toLowerCase(); return this.types[ext] || fallback || this.default_type; }; @@ -101,7 +101,7 @@ mime.Mime = Mime; mime.charsets = { lookup: function(mimeType, fallback) { // Assume text types are utf8 - return (/^text\//).test(mimeType) ? 'UTF-8' : fallback; + return (/^text\/|^application\/(javascript|json)/).test(mimeType) ? 'UTF-8' : fallback; } }; diff --git a/nodejs/node_modules/mime/package.json b/nodejs/node_modules/mime/package.json index 5d616951f..f55a48722 100644 --- a/nodejs/node_modules/mime/package.json +++ b/nodejs/node_modules/mime/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "mime@1.3.4", - "scope": null, - "escapedName": "mime", - "name": "mime", - "rawSpec": "1.3.4", - "spec": "1.3.4", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/send" + "mime@1.4.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "mime@1.3.4", - "_id": "mime@1.3.4", - "_inCache": true, + "_from": "mime@1.4.1", + "_id": "mime@1.4.1", + "_inBundle": false, + "_integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", "_location": "/mime", - "_npmUser": { - "name": "broofa", - "email": "robert@broofa.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "mime@1.3.4", - "scope": null, - "escapedName": "mime", + "type": "version", + "registry": true, + "raw": "mime@1.4.1", "name": "mime", - "rawSpec": "1.3.4", - "spec": "1.3.4", - "type": "version" + "escapedName": "mime", + "rawSpec": "1.4.1", + "saveSpec": null, + "fetchSpec": "1.4.1" }, "_requiredBy": [ "/send" ], - "_resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "_shasum": "115f9e3b6b3daf2959983cb38f149a2d40eb5d53", - "_shrinkwrap": null, - "_spec": "mime@1.3.4", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/send", + "_resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", + "_spec": "1.4.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Robert Kieffer", "email": "robert@broofa.com", @@ -61,39 +48,16 @@ "dependencies": {}, "description": "A comprehensive library for mime-type mapping", "devDependencies": { - "mime-db": "^1.2.0" + "mime-db": "1.30.0" }, - "directories": {}, - "dist": { - "shasum": "115f9e3b6b3daf2959983cb38f149a2d40eb5d53", - "tarball": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" - }, - "gitHead": "1628f6e0187095009dcef4805c3a49706f137974", - "homepage": "https://github.com/broofa/node-mime", + "homepage": "https://github.com/broofa/node-mime#readme", "keywords": [ "util", "mime" ], - "licenses": [ - { - "type": "MIT", - "url": "https://raw.github.com/broofa/node-mime/master/LICENSE" - } - ], + "license": "MIT", "main": "mime.js", - "maintainers": [ - { - "name": "broofa", - "email": "robert@broofa.com" - }, - { - "name": "bentomas", - "email": "benjamin@benjaminthomas.org" - } - ], "name": "mime", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "url": "git+https://github.com/broofa/node-mime.git", "type": "git" @@ -102,5 +66,5 @@ "prepublish": "node build/build.js > types.json", "test": "node build/test.js" }, - "version": "1.3.4" + "version": "1.4.1" } diff --git a/nodejs/node_modules/mime/types.json b/nodejs/node_modules/mime/types.json index c674b1c8f..5369cd1ca 100644 --- a/nodejs/node_modules/mime/types.json +++ b/nodejs/node_modules/mime/types.json @@ -1 +1 @@ -{"application/andrew-inset":["ez"],"application/applixware":["aw"],"application/atom+xml":["atom"],"application/atomcat+xml":["atomcat"],"application/atomsvc+xml":["atomsvc"],"application/ccxml+xml":["ccxml"],"application/cdmi-capability":["cdmia"],"application/cdmi-container":["cdmic"],"application/cdmi-domain":["cdmid"],"application/cdmi-object":["cdmio"],"application/cdmi-queue":["cdmiq"],"application/cu-seeme":["cu"],"application/dash+xml":["mdp"],"application/davmount+xml":["davmount"],"application/docbook+xml":["dbk"],"application/dssc+der":["dssc"],"application/dssc+xml":["xdssc"],"application/ecmascript":["ecma"],"application/emma+xml":["emma"],"application/epub+zip":["epub"],"application/exi":["exi"],"application/font-tdpfr":["pfr"],"application/font-woff":["woff"],"application/font-woff2":["woff2"],"application/gml+xml":["gml"],"application/gpx+xml":["gpx"],"application/gxf":["gxf"],"application/hyperstudio":["stk"],"application/inkml+xml":["ink","inkml"],"application/ipfix":["ipfix"],"application/java-archive":["jar"],"application/java-serialized-object":["ser"],"application/java-vm":["class"],"application/javascript":["js"],"application/json":["json","map"],"application/json5":["json5"],"application/jsonml+json":["jsonml"],"application/lost+xml":["lostxml"],"application/mac-binhex40":["hqx"],"application/mac-compactpro":["cpt"],"application/mads+xml":["mads"],"application/marc":["mrc"],"application/marcxml+xml":["mrcx"],"application/mathematica":["ma","nb","mb"],"application/mathml+xml":["mathml"],"application/mbox":["mbox"],"application/mediaservercontrol+xml":["mscml"],"application/metalink+xml":["metalink"],"application/metalink4+xml":["meta4"],"application/mets+xml":["mets"],"application/mods+xml":["mods"],"application/mp21":["m21","mp21"],"application/mp4":["mp4s","m4p"],"application/msword":["doc","dot"],"application/mxf":["mxf"],"application/octet-stream":["bin","dms","lrf","mar","so","dist","distz","pkg","bpk","dump","elc","deploy","buffer"],"application/oda":["oda"],"application/oebps-package+xml":["opf"],"application/ogg":["ogx"],"application/omdoc+xml":["omdoc"],"application/onenote":["onetoc","onetoc2","onetmp","onepkg"],"application/oxps":["oxps"],"application/patch-ops-error+xml":["xer"],"application/pdf":["pdf"],"application/pgp-encrypted":["pgp"],"application/pgp-signature":["asc","sig"],"application/pics-rules":["prf"],"application/pkcs10":["p10"],"application/pkcs7-mime":["p7m","p7c"],"application/pkcs7-signature":["p7s"],"application/pkcs8":["p8"],"application/pkix-attr-cert":["ac"],"application/pkix-cert":["cer"],"application/pkix-crl":["crl"],"application/pkix-pkipath":["pkipath"],"application/pkixcmp":["pki"],"application/pls+xml":["pls"],"application/postscript":["ai","eps","ps"],"application/prs.cww":["cww"],"application/pskc+xml":["pskcxml"],"application/rdf+xml":["rdf"],"application/reginfo+xml":["rif"],"application/relax-ng-compact-syntax":["rnc"],"application/resource-lists+xml":["rl"],"application/resource-lists-diff+xml":["rld"],"application/rls-services+xml":["rs"],"application/rpki-ghostbusters":["gbr"],"application/rpki-manifest":["mft"],"application/rpki-roa":["roa"],"application/rsd+xml":["rsd"],"application/rss+xml":["rss"],"application/rtf":["rtf"],"application/sbml+xml":["sbml"],"application/scvp-cv-request":["scq"],"application/scvp-cv-response":["scs"],"application/scvp-vp-request":["spq"],"application/scvp-vp-response":["spp"],"application/sdp":["sdp"],"application/set-payment-initiation":["setpay"],"application/set-registration-initiation":["setreg"],"application/shf+xml":["shf"],"application/smil+xml":["smi","smil"],"application/sparql-query":["rq"],"application/sparql-results+xml":["srx"],"application/srgs":["gram"],"application/srgs+xml":["grxml"],"application/sru+xml":["sru"],"application/ssdl+xml":["ssdl"],"application/ssml+xml":["ssml"],"application/tei+xml":["tei","teicorpus"],"application/thraud+xml":["tfi"],"application/timestamped-data":["tsd"],"application/vnd.3gpp.pic-bw-large":["plb"],"application/vnd.3gpp.pic-bw-small":["psb"],"application/vnd.3gpp.pic-bw-var":["pvb"],"application/vnd.3gpp2.tcap":["tcap"],"application/vnd.3m.post-it-notes":["pwn"],"application/vnd.accpac.simply.aso":["aso"],"application/vnd.accpac.simply.imp":["imp"],"application/vnd.acucobol":["acu"],"application/vnd.acucorp":["atc","acutc"],"application/vnd.adobe.air-application-installer-package+zip":["air"],"application/vnd.adobe.formscentral.fcdt":["fcdt"],"application/vnd.adobe.fxp":["fxp","fxpl"],"application/vnd.adobe.xdp+xml":["xdp"],"application/vnd.adobe.xfdf":["xfdf"],"application/vnd.ahead.space":["ahead"],"application/vnd.airzip.filesecure.azf":["azf"],"application/vnd.airzip.filesecure.azs":["azs"],"application/vnd.amazon.ebook":["azw"],"application/vnd.americandynamics.acc":["acc"],"application/vnd.amiga.ami":["ami"],"application/vnd.android.package-archive":["apk"],"application/vnd.anser-web-certificate-issue-initiation":["cii"],"application/vnd.anser-web-funds-transfer-initiation":["fti"],"application/vnd.antix.game-component":["atx"],"application/vnd.apple.installer+xml":["mpkg"],"application/vnd.apple.mpegurl":["m3u8"],"application/vnd.aristanetworks.swi":["swi"],"application/vnd.astraea-software.iota":["iota"],"application/vnd.audiograph":["aep"],"application/vnd.blueice.multipass":["mpm"],"application/vnd.bmi":["bmi"],"application/vnd.businessobjects":["rep"],"application/vnd.chemdraw+xml":["cdxml"],"application/vnd.chipnuts.karaoke-mmd":["mmd"],"application/vnd.cinderella":["cdy"],"application/vnd.claymore":["cla"],"application/vnd.cloanto.rp9":["rp9"],"application/vnd.clonk.c4group":["c4g","c4d","c4f","c4p","c4u"],"application/vnd.cluetrust.cartomobile-config":["c11amc"],"application/vnd.cluetrust.cartomobile-config-pkg":["c11amz"],"application/vnd.commonspace":["csp"],"application/vnd.contact.cmsg":["cdbcmsg"],"application/vnd.cosmocaller":["cmc"],"application/vnd.crick.clicker":["clkx"],"application/vnd.crick.clicker.keyboard":["clkk"],"application/vnd.crick.clicker.palette":["clkp"],"application/vnd.crick.clicker.template":["clkt"],"application/vnd.crick.clicker.wordbank":["clkw"],"application/vnd.criticaltools.wbs+xml":["wbs"],"application/vnd.ctc-posml":["pml"],"application/vnd.cups-ppd":["ppd"],"application/vnd.curl.car":["car"],"application/vnd.curl.pcurl":["pcurl"],"application/vnd.dart":["dart"],"application/vnd.data-vision.rdz":["rdz"],"application/vnd.dece.data":["uvf","uvvf","uvd","uvvd"],"application/vnd.dece.ttml+xml":["uvt","uvvt"],"application/vnd.dece.unspecified":["uvx","uvvx"],"application/vnd.dece.zip":["uvz","uvvz"],"application/vnd.denovo.fcselayout-link":["fe_launch"],"application/vnd.dna":["dna"],"application/vnd.dolby.mlp":["mlp"],"application/vnd.dpgraph":["dpg"],"application/vnd.dreamfactory":["dfac"],"application/vnd.ds-keypoint":["kpxx"],"application/vnd.dvb.ait":["ait"],"application/vnd.dvb.service":["svc"],"application/vnd.dynageo":["geo"],"application/vnd.ecowin.chart":["mag"],"application/vnd.enliven":["nml"],"application/vnd.epson.esf":["esf"],"application/vnd.epson.msf":["msf"],"application/vnd.epson.quickanime":["qam"],"application/vnd.epson.salt":["slt"],"application/vnd.epson.ssf":["ssf"],"application/vnd.eszigno3+xml":["es3","et3"],"application/vnd.ezpix-album":["ez2"],"application/vnd.ezpix-package":["ez3"],"application/vnd.fdf":["fdf"],"application/vnd.fdsn.mseed":["mseed"],"application/vnd.fdsn.seed":["seed","dataless"],"application/vnd.flographit":["gph"],"application/vnd.fluxtime.clip":["ftc"],"application/vnd.framemaker":["fm","frame","maker","book"],"application/vnd.frogans.fnc":["fnc"],"application/vnd.frogans.ltf":["ltf"],"application/vnd.fsc.weblaunch":["fsc"],"application/vnd.fujitsu.oasys":["oas"],"application/vnd.fujitsu.oasys2":["oa2"],"application/vnd.fujitsu.oasys3":["oa3"],"application/vnd.fujitsu.oasysgp":["fg5"],"application/vnd.fujitsu.oasysprs":["bh2"],"application/vnd.fujixerox.ddd":["ddd"],"application/vnd.fujixerox.docuworks":["xdw"],"application/vnd.fujixerox.docuworks.binder":["xbd"],"application/vnd.fuzzysheet":["fzs"],"application/vnd.genomatix.tuxedo":["txd"],"application/vnd.geogebra.file":["ggb"],"application/vnd.geogebra.tool":["ggt"],"application/vnd.geometry-explorer":["gex","gre"],"application/vnd.geonext":["gxt"],"application/vnd.geoplan":["g2w"],"application/vnd.geospace":["g3w"],"application/vnd.gmx":["gmx"],"application/vnd.google-earth.kml+xml":["kml"],"application/vnd.google-earth.kmz":["kmz"],"application/vnd.grafeq":["gqf","gqs"],"application/vnd.groove-account":["gac"],"application/vnd.groove-help":["ghf"],"application/vnd.groove-identity-message":["gim"],"application/vnd.groove-injector":["grv"],"application/vnd.groove-tool-message":["gtm"],"application/vnd.groove-tool-template":["tpl"],"application/vnd.groove-vcard":["vcg"],"application/vnd.hal+xml":["hal"],"application/vnd.handheld-entertainment+xml":["zmm"],"application/vnd.hbci":["hbci"],"application/vnd.hhe.lesson-player":["les"],"application/vnd.hp-hpgl":["hpgl"],"application/vnd.hp-hpid":["hpid"],"application/vnd.hp-hps":["hps"],"application/vnd.hp-jlyt":["jlt"],"application/vnd.hp-pcl":["pcl"],"application/vnd.hp-pclxl":["pclxl"],"application/vnd.ibm.minipay":["mpy"],"application/vnd.ibm.modcap":["afp","listafp","list3820"],"application/vnd.ibm.rights-management":["irm"],"application/vnd.ibm.secure-container":["sc"],"application/vnd.iccprofile":["icc","icm"],"application/vnd.igloader":["igl"],"application/vnd.immervision-ivp":["ivp"],"application/vnd.immervision-ivu":["ivu"],"application/vnd.insors.igm":["igm"],"application/vnd.intercon.formnet":["xpw","xpx"],"application/vnd.intergeo":["i2g"],"application/vnd.intu.qbo":["qbo"],"application/vnd.intu.qfx":["qfx"],"application/vnd.ipunplugged.rcprofile":["rcprofile"],"application/vnd.irepository.package+xml":["irp"],"application/vnd.is-xpr":["xpr"],"application/vnd.isac.fcs":["fcs"],"application/vnd.jam":["jam"],"application/vnd.jcp.javame.midlet-rms":["rms"],"application/vnd.jisp":["jisp"],"application/vnd.joost.joda-archive":["joda"],"application/vnd.kahootz":["ktz","ktr"],"application/vnd.kde.karbon":["karbon"],"application/vnd.kde.kchart":["chrt"],"application/vnd.kde.kformula":["kfo"],"application/vnd.kde.kivio":["flw"],"application/vnd.kde.kontour":["kon"],"application/vnd.kde.kpresenter":["kpr","kpt"],"application/vnd.kde.kspread":["ksp"],"application/vnd.kde.kword":["kwd","kwt"],"application/vnd.kenameaapp":["htke"],"application/vnd.kidspiration":["kia"],"application/vnd.kinar":["kne","knp"],"application/vnd.koan":["skp","skd","skt","skm"],"application/vnd.kodak-descriptor":["sse"],"application/vnd.las.las+xml":["lasxml"],"application/vnd.llamagraphics.life-balance.desktop":["lbd"],"application/vnd.llamagraphics.life-balance.exchange+xml":["lbe"],"application/vnd.lotus-1-2-3":["123"],"application/vnd.lotus-approach":["apr"],"application/vnd.lotus-freelance":["pre"],"application/vnd.lotus-notes":["nsf"],"application/vnd.lotus-organizer":["org"],"application/vnd.lotus-screencam":["scm"],"application/vnd.lotus-wordpro":["lwp"],"application/vnd.macports.portpkg":["portpkg"],"application/vnd.mcd":["mcd"],"application/vnd.medcalcdata":["mc1"],"application/vnd.mediastation.cdkey":["cdkey"],"application/vnd.mfer":["mwf"],"application/vnd.mfmp":["mfm"],"application/vnd.micrografx.flo":["flo"],"application/vnd.micrografx.igx":["igx"],"application/vnd.mif":["mif"],"application/vnd.mobius.daf":["daf"],"application/vnd.mobius.dis":["dis"],"application/vnd.mobius.mbk":["mbk"],"application/vnd.mobius.mqy":["mqy"],"application/vnd.mobius.msl":["msl"],"application/vnd.mobius.plc":["plc"],"application/vnd.mobius.txf":["txf"],"application/vnd.mophun.application":["mpn"],"application/vnd.mophun.certificate":["mpc"],"application/vnd.mozilla.xul+xml":["xul"],"application/vnd.ms-artgalry":["cil"],"application/vnd.ms-cab-compressed":["cab"],"application/vnd.ms-excel":["xls","xlm","xla","xlc","xlt","xlw"],"application/vnd.ms-excel.addin.macroenabled.12":["xlam"],"application/vnd.ms-excel.sheet.binary.macroenabled.12":["xlsb"],"application/vnd.ms-excel.sheet.macroenabled.12":["xlsm"],"application/vnd.ms-excel.template.macroenabled.12":["xltm"],"application/vnd.ms-fontobject":["eot"],"application/vnd.ms-htmlhelp":["chm"],"application/vnd.ms-ims":["ims"],"application/vnd.ms-lrm":["lrm"],"application/vnd.ms-officetheme":["thmx"],"application/vnd.ms-pki.seccat":["cat"],"application/vnd.ms-pki.stl":["stl"],"application/vnd.ms-powerpoint":["ppt","pps","pot"],"application/vnd.ms-powerpoint.addin.macroenabled.12":["ppam"],"application/vnd.ms-powerpoint.presentation.macroenabled.12":["pptm"],"application/vnd.ms-powerpoint.slide.macroenabled.12":["sldm"],"application/vnd.ms-powerpoint.slideshow.macroenabled.12":["ppsm"],"application/vnd.ms-powerpoint.template.macroenabled.12":["potm"],"application/vnd.ms-project":["mpp","mpt"],"application/vnd.ms-word.document.macroenabled.12":["docm"],"application/vnd.ms-word.template.macroenabled.12":["dotm"],"application/vnd.ms-works":["wps","wks","wcm","wdb"],"application/vnd.ms-wpl":["wpl"],"application/vnd.ms-xpsdocument":["xps"],"application/vnd.mseq":["mseq"],"application/vnd.musician":["mus"],"application/vnd.muvee.style":["msty"],"application/vnd.mynfc":["taglet"],"application/vnd.neurolanguage.nlu":["nlu"],"application/vnd.nitf":["ntf","nitf"],"application/vnd.noblenet-directory":["nnd"],"application/vnd.noblenet-sealer":["nns"],"application/vnd.noblenet-web":["nnw"],"application/vnd.nokia.n-gage.data":["ngdat"],"application/vnd.nokia.radio-preset":["rpst"],"application/vnd.nokia.radio-presets":["rpss"],"application/vnd.novadigm.edm":["edm"],"application/vnd.novadigm.edx":["edx"],"application/vnd.novadigm.ext":["ext"],"application/vnd.oasis.opendocument.chart":["odc"],"application/vnd.oasis.opendocument.chart-template":["otc"],"application/vnd.oasis.opendocument.database":["odb"],"application/vnd.oasis.opendocument.formula":["odf"],"application/vnd.oasis.opendocument.formula-template":["odft"],"application/vnd.oasis.opendocument.graphics":["odg"],"application/vnd.oasis.opendocument.graphics-template":["otg"],"application/vnd.oasis.opendocument.image":["odi"],"application/vnd.oasis.opendocument.image-template":["oti"],"application/vnd.oasis.opendocument.presentation":["odp"],"application/vnd.oasis.opendocument.presentation-template":["otp"],"application/vnd.oasis.opendocument.spreadsheet":["ods"],"application/vnd.oasis.opendocument.spreadsheet-template":["ots"],"application/vnd.oasis.opendocument.text":["odt"],"application/vnd.oasis.opendocument.text-master":["odm"],"application/vnd.oasis.opendocument.text-template":["ott"],"application/vnd.oasis.opendocument.text-web":["oth"],"application/vnd.olpc-sugar":["xo"],"application/vnd.oma.dd2+xml":["dd2"],"application/vnd.openofficeorg.extension":["oxt"],"application/vnd.openxmlformats-officedocument.presentationml.presentation":["pptx"],"application/vnd.openxmlformats-officedocument.presentationml.slide":["sldx"],"application/vnd.openxmlformats-officedocument.presentationml.slideshow":["ppsx"],"application/vnd.openxmlformats-officedocument.presentationml.template":["potx"],"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":["xlsx"],"application/vnd.openxmlformats-officedocument.spreadsheetml.template":["xltx"],"application/vnd.openxmlformats-officedocument.wordprocessingml.document":["docx"],"application/vnd.openxmlformats-officedocument.wordprocessingml.template":["dotx"],"application/vnd.osgeo.mapguide.package":["mgp"],"application/vnd.osgi.dp":["dp"],"application/vnd.osgi.subsystem":["esa"],"application/vnd.palm":["pdb","pqa","oprc"],"application/vnd.pawaafile":["paw"],"application/vnd.pg.format":["str"],"application/vnd.pg.osasli":["ei6"],"application/vnd.picsel":["efif"],"application/vnd.pmi.widget":["wg"],"application/vnd.pocketlearn":["plf"],"application/vnd.powerbuilder6":["pbd"],"application/vnd.previewsystems.box":["box"],"application/vnd.proteus.magazine":["mgz"],"application/vnd.publishare-delta-tree":["qps"],"application/vnd.pvi.ptid1":["ptid"],"application/vnd.quark.quarkxpress":["qxd","qxt","qwd","qwt","qxl","qxb"],"application/vnd.realvnc.bed":["bed"],"application/vnd.recordare.musicxml":["mxl"],"application/vnd.recordare.musicxml+xml":["musicxml"],"application/vnd.rig.cryptonote":["cryptonote"],"application/vnd.rim.cod":["cod"],"application/vnd.rn-realmedia":["rm"],"application/vnd.rn-realmedia-vbr":["rmvb"],"application/vnd.route66.link66+xml":["link66"],"application/vnd.sailingtracker.track":["st"],"application/vnd.seemail":["see"],"application/vnd.sema":["sema"],"application/vnd.semd":["semd"],"application/vnd.semf":["semf"],"application/vnd.shana.informed.formdata":["ifm"],"application/vnd.shana.informed.formtemplate":["itp"],"application/vnd.shana.informed.interchange":["iif"],"application/vnd.shana.informed.package":["ipk"],"application/vnd.simtech-mindmapper":["twd","twds"],"application/vnd.smaf":["mmf"],"application/vnd.smart.teacher":["teacher"],"application/vnd.solent.sdkm+xml":["sdkm","sdkd"],"application/vnd.spotfire.dxp":["dxp"],"application/vnd.spotfire.sfs":["sfs"],"application/vnd.stardivision.calc":["sdc"],"application/vnd.stardivision.draw":["sda"],"application/vnd.stardivision.impress":["sdd"],"application/vnd.stardivision.math":["smf"],"application/vnd.stardivision.writer":["sdw","vor"],"application/vnd.stardivision.writer-global":["sgl"],"application/vnd.stepmania.package":["smzip"],"application/vnd.stepmania.stepchart":["sm"],"application/vnd.sun.xml.calc":["sxc"],"application/vnd.sun.xml.calc.template":["stc"],"application/vnd.sun.xml.draw":["sxd"],"application/vnd.sun.xml.draw.template":["std"],"application/vnd.sun.xml.impress":["sxi"],"application/vnd.sun.xml.impress.template":["sti"],"application/vnd.sun.xml.math":["sxm"],"application/vnd.sun.xml.writer":["sxw"],"application/vnd.sun.xml.writer.global":["sxg"],"application/vnd.sun.xml.writer.template":["stw"],"application/vnd.sus-calendar":["sus","susp"],"application/vnd.svd":["svd"],"application/vnd.symbian.install":["sis","sisx"],"application/vnd.syncml+xml":["xsm"],"application/vnd.syncml.dm+wbxml":["bdm"],"application/vnd.syncml.dm+xml":["xdm"],"application/vnd.tao.intent-module-archive":["tao"],"application/vnd.tcpdump.pcap":["pcap","cap","dmp"],"application/vnd.tmobile-livetv":["tmo"],"application/vnd.trid.tpt":["tpt"],"application/vnd.triscape.mxs":["mxs"],"application/vnd.trueapp":["tra"],"application/vnd.ufdl":["ufd","ufdl"],"application/vnd.uiq.theme":["utz"],"application/vnd.umajin":["umj"],"application/vnd.unity":["unityweb"],"application/vnd.uoml+xml":["uoml"],"application/vnd.vcx":["vcx"],"application/vnd.visio":["vsd","vst","vss","vsw"],"application/vnd.visionary":["vis"],"application/vnd.vsf":["vsf"],"application/vnd.wap.wbxml":["wbxml"],"application/vnd.wap.wmlc":["wmlc"],"application/vnd.wap.wmlscriptc":["wmlsc"],"application/vnd.webturbo":["wtb"],"application/vnd.wolfram.player":["nbp"],"application/vnd.wordperfect":["wpd"],"application/vnd.wqd":["wqd"],"application/vnd.wt.stf":["stf"],"application/vnd.xara":["xar"],"application/vnd.xfdl":["xfdl"],"application/vnd.yamaha.hv-dic":["hvd"],"application/vnd.yamaha.hv-script":["hvs"],"application/vnd.yamaha.hv-voice":["hvp"],"application/vnd.yamaha.openscoreformat":["osf"],"application/vnd.yamaha.openscoreformat.osfpvg+xml":["osfpvg"],"application/vnd.yamaha.smaf-audio":["saf"],"application/vnd.yamaha.smaf-phrase":["spf"],"application/vnd.yellowriver-custom-menu":["cmp"],"application/vnd.zul":["zir","zirz"],"application/vnd.zzazz.deck+xml":["zaz"],"application/voicexml+xml":["vxml"],"application/widget":["wgt"],"application/winhlp":["hlp"],"application/wsdl+xml":["wsdl"],"application/wspolicy+xml":["wspolicy"],"application/x-7z-compressed":["7z"],"application/x-abiword":["abw"],"application/x-ace-compressed":["ace"],"application/x-apple-diskimage":["dmg"],"application/x-authorware-bin":["aab","x32","u32","vox"],"application/x-authorware-map":["aam"],"application/x-authorware-seg":["aas"],"application/x-bcpio":["bcpio"],"application/x-bittorrent":["torrent"],"application/x-blorb":["blb","blorb"],"application/x-bzip":["bz"],"application/x-bzip2":["bz2","boz"],"application/x-cbr":["cbr","cba","cbt","cbz","cb7"],"application/x-cdlink":["vcd"],"application/x-cfs-compressed":["cfs"],"application/x-chat":["chat"],"application/x-chess-pgn":["pgn"],"application/x-chrome-extension":["crx"],"application/x-conference":["nsc"],"application/x-cpio":["cpio"],"application/x-csh":["csh"],"application/x-debian-package":["deb","udeb"],"application/x-dgc-compressed":["dgc"],"application/x-director":["dir","dcr","dxr","cst","cct","cxt","w3d","fgd","swa"],"application/x-doom":["wad"],"application/x-dtbncx+xml":["ncx"],"application/x-dtbook+xml":["dtb"],"application/x-dtbresource+xml":["res"],"application/x-dvi":["dvi"],"application/x-envoy":["evy"],"application/x-eva":["eva"],"application/x-font-bdf":["bdf"],"application/x-font-ghostscript":["gsf"],"application/x-font-linux-psf":["psf"],"application/x-font-otf":["otf"],"application/x-font-pcf":["pcf"],"application/x-font-snf":["snf"],"application/x-font-ttf":["ttf","ttc"],"application/x-font-type1":["pfa","pfb","pfm","afm"],"application/x-freearc":["arc"],"application/x-futuresplash":["spl"],"application/x-gca-compressed":["gca"],"application/x-glulx":["ulx"],"application/x-gnumeric":["gnumeric"],"application/x-gramps-xml":["gramps"],"application/x-gtar":["gtar"],"application/x-hdf":["hdf"],"application/x-install-instructions":["install"],"application/x-iso9660-image":["iso"],"application/x-java-jnlp-file":["jnlp"],"application/x-latex":["latex"],"application/x-lua-bytecode":["luac"],"application/x-lzh-compressed":["lzh","lha"],"application/x-mie":["mie"],"application/x-mobipocket-ebook":["prc","mobi"],"application/x-ms-application":["application"],"application/x-ms-shortcut":["lnk"],"application/x-ms-wmd":["wmd"],"application/x-ms-wmz":["wmz"],"application/x-ms-xbap":["xbap"],"application/x-msaccess":["mdb"],"application/x-msbinder":["obd"],"application/x-mscardfile":["crd"],"application/x-msclip":["clp"],"application/x-msdownload":["exe","dll","com","bat","msi"],"application/x-msmediaview":["mvb","m13","m14"],"application/x-msmetafile":["wmf","wmz","emf","emz"],"application/x-msmoney":["mny"],"application/x-mspublisher":["pub"],"application/x-msschedule":["scd"],"application/x-msterminal":["trm"],"application/x-mswrite":["wri"],"application/x-netcdf":["nc","cdf"],"application/x-nzb":["nzb"],"application/x-pkcs12":["p12","pfx"],"application/x-pkcs7-certificates":["p7b","spc"],"application/x-pkcs7-certreqresp":["p7r"],"application/x-rar-compressed":["rar"],"application/x-research-info-systems":["ris"],"application/x-sh":["sh"],"application/x-shar":["shar"],"application/x-shockwave-flash":["swf"],"application/x-silverlight-app":["xap"],"application/x-sql":["sql"],"application/x-stuffit":["sit"],"application/x-stuffitx":["sitx"],"application/x-subrip":["srt"],"application/x-sv4cpio":["sv4cpio"],"application/x-sv4crc":["sv4crc"],"application/x-t3vm-image":["t3"],"application/x-tads":["gam"],"application/x-tar":["tar"],"application/x-tcl":["tcl"],"application/x-tex":["tex"],"application/x-tex-tfm":["tfm"],"application/x-texinfo":["texinfo","texi"],"application/x-tgif":["obj"],"application/x-ustar":["ustar"],"application/x-wais-source":["src"],"application/x-web-app-manifest+json":["webapp"],"application/x-x509-ca-cert":["der","crt"],"application/x-xfig":["fig"],"application/x-xliff+xml":["xlf"],"application/x-xpinstall":["xpi"],"application/x-xz":["xz"],"application/x-zmachine":["z1","z2","z3","z4","z5","z6","z7","z8"],"application/xaml+xml":["xaml"],"application/xcap-diff+xml":["xdf"],"application/xenc+xml":["xenc"],"application/xhtml+xml":["xhtml","xht"],"application/xml":["xml","xsl","xsd"],"application/xml-dtd":["dtd"],"application/xop+xml":["xop"],"application/xproc+xml":["xpl"],"application/xslt+xml":["xslt"],"application/xspf+xml":["xspf"],"application/xv+xml":["mxml","xhvml","xvml","xvm"],"application/yang":["yang"],"application/yin+xml":["yin"],"application/zip":["zip"],"audio/adpcm":["adp"],"audio/basic":["au","snd"],"audio/midi":["mid","midi","kar","rmi"],"audio/mp4":["mp4a","m4a"],"audio/mpeg":["mpga","mp2","mp2a","mp3","m2a","m3a"],"audio/ogg":["oga","ogg","spx"],"audio/s3m":["s3m"],"audio/silk":["sil"],"audio/vnd.dece.audio":["uva","uvva"],"audio/vnd.digital-winds":["eol"],"audio/vnd.dra":["dra"],"audio/vnd.dts":["dts"],"audio/vnd.dts.hd":["dtshd"],"audio/vnd.lucent.voice":["lvp"],"audio/vnd.ms-playready.media.pya":["pya"],"audio/vnd.nuera.ecelp4800":["ecelp4800"],"audio/vnd.nuera.ecelp7470":["ecelp7470"],"audio/vnd.nuera.ecelp9600":["ecelp9600"],"audio/vnd.rip":["rip"],"audio/webm":["weba"],"audio/x-aac":["aac"],"audio/x-aiff":["aif","aiff","aifc"],"audio/x-caf":["caf"],"audio/x-flac":["flac"],"audio/x-matroska":["mka"],"audio/x-mpegurl":["m3u"],"audio/x-ms-wax":["wax"],"audio/x-ms-wma":["wma"],"audio/x-pn-realaudio":["ram","ra"],"audio/x-pn-realaudio-plugin":["rmp"],"audio/x-wav":["wav"],"audio/xm":["xm"],"chemical/x-cdx":["cdx"],"chemical/x-cif":["cif"],"chemical/x-cmdf":["cmdf"],"chemical/x-cml":["cml"],"chemical/x-csml":["csml"],"chemical/x-xyz":["xyz"],"font/opentype":["otf"],"image/bmp":["bmp"],"image/cgm":["cgm"],"image/g3fax":["g3"],"image/gif":["gif"],"image/ief":["ief"],"image/jpeg":["jpeg","jpg","jpe"],"image/ktx":["ktx"],"image/png":["png"],"image/prs.btif":["btif"],"image/sgi":["sgi"],"image/svg+xml":["svg","svgz"],"image/tiff":["tiff","tif"],"image/vnd.adobe.photoshop":["psd"],"image/vnd.dece.graphic":["uvi","uvvi","uvg","uvvg"],"image/vnd.djvu":["djvu","djv"],"image/vnd.dvb.subtitle":["sub"],"image/vnd.dwg":["dwg"],"image/vnd.dxf":["dxf"],"image/vnd.fastbidsheet":["fbs"],"image/vnd.fpx":["fpx"],"image/vnd.fst":["fst"],"image/vnd.fujixerox.edmics-mmr":["mmr"],"image/vnd.fujixerox.edmics-rlc":["rlc"],"image/vnd.ms-modi":["mdi"],"image/vnd.ms-photo":["wdp"],"image/vnd.net-fpx":["npx"],"image/vnd.wap.wbmp":["wbmp"],"image/vnd.xiff":["xif"],"image/webp":["webp"],"image/x-3ds":["3ds"],"image/x-cmu-raster":["ras"],"image/x-cmx":["cmx"],"image/x-freehand":["fh","fhc","fh4","fh5","fh7"],"image/x-icon":["ico"],"image/x-mrsid-image":["sid"],"image/x-pcx":["pcx"],"image/x-pict":["pic","pct"],"image/x-portable-anymap":["pnm"],"image/x-portable-bitmap":["pbm"],"image/x-portable-graymap":["pgm"],"image/x-portable-pixmap":["ppm"],"image/x-rgb":["rgb"],"image/x-tga":["tga"],"image/x-xbitmap":["xbm"],"image/x-xpixmap":["xpm"],"image/x-xwindowdump":["xwd"],"message/rfc822":["eml","mime"],"model/iges":["igs","iges"],"model/mesh":["msh","mesh","silo"],"model/vnd.collada+xml":["dae"],"model/vnd.dwf":["dwf"],"model/vnd.gdl":["gdl"],"model/vnd.gtw":["gtw"],"model/vnd.mts":["mts"],"model/vnd.vtu":["vtu"],"model/vrml":["wrl","vrml"],"model/x3d+binary":["x3db","x3dbz"],"model/x3d+vrml":["x3dv","x3dvz"],"model/x3d+xml":["x3d","x3dz"],"text/cache-manifest":["appcache","manifest"],"text/calendar":["ics","ifb"],"text/coffeescript":["coffee"],"text/css":["css"],"text/csv":["csv"],"text/hjson":["hjson"],"text/html":["html","htm"],"text/jade":["jade"],"text/jsx":["jsx"],"text/less":["less"],"text/n3":["n3"],"text/plain":["txt","text","conf","def","list","log","in","ini"],"text/prs.lines.tag":["dsc"],"text/richtext":["rtx"],"text/sgml":["sgml","sgm"],"text/stylus":["stylus","styl"],"text/tab-separated-values":["tsv"],"text/troff":["t","tr","roff","man","me","ms"],"text/turtle":["ttl"],"text/uri-list":["uri","uris","urls"],"text/vcard":["vcard"],"text/vnd.curl":["curl"],"text/vnd.curl.dcurl":["dcurl"],"text/vnd.curl.mcurl":["mcurl"],"text/vnd.curl.scurl":["scurl"],"text/vnd.dvb.subtitle":["sub"],"text/vnd.fly":["fly"],"text/vnd.fmi.flexstor":["flx"],"text/vnd.graphviz":["gv"],"text/vnd.in3d.3dml":["3dml"],"text/vnd.in3d.spot":["spot"],"text/vnd.sun.j2me.app-descriptor":["jad"],"text/vnd.wap.wml":["wml"],"text/vnd.wap.wmlscript":["wmls"],"text/vtt":["vtt"],"text/x-asm":["s","asm"],"text/x-c":["c","cc","cxx","cpp","h","hh","dic"],"text/x-component":["htc"],"text/x-fortran":["f","for","f77","f90"],"text/x-handlebars-template":["hbs"],"text/x-java-source":["java"],"text/x-lua":["lua"],"text/x-markdown":["markdown","md","mkd"],"text/x-nfo":["nfo"],"text/x-opml":["opml"],"text/x-pascal":["p","pas"],"text/x-sass":["sass"],"text/x-scss":["scss"],"text/x-setext":["etx"],"text/x-sfv":["sfv"],"text/x-uuencode":["uu"],"text/x-vcalendar":["vcs"],"text/x-vcard":["vcf"],"text/yaml":["yaml","yml"],"video/3gpp":["3gp"],"video/3gpp2":["3g2"],"video/h261":["h261"],"video/h263":["h263"],"video/h264":["h264"],"video/jpeg":["jpgv"],"video/jpm":["jpm","jpgm"],"video/mj2":["mj2","mjp2"],"video/mp2t":["ts"],"video/mp4":["mp4","mp4v","mpg4"],"video/mpeg":["mpeg","mpg","mpe","m1v","m2v"],"video/ogg":["ogv"],"video/quicktime":["qt","mov"],"video/vnd.dece.hd":["uvh","uvvh"],"video/vnd.dece.mobile":["uvm","uvvm"],"video/vnd.dece.pd":["uvp","uvvp"],"video/vnd.dece.sd":["uvs","uvvs"],"video/vnd.dece.video":["uvv","uvvv"],"video/vnd.dvb.file":["dvb"],"video/vnd.fvt":["fvt"],"video/vnd.mpegurl":["mxu","m4u"],"video/vnd.ms-playready.media.pyv":["pyv"],"video/vnd.uvvu.mp4":["uvu","uvvu"],"video/vnd.vivo":["viv"],"video/webm":["webm"],"video/x-f4v":["f4v"],"video/x-fli":["fli"],"video/x-flv":["flv"],"video/x-m4v":["m4v"],"video/x-matroska":["mkv","mk3d","mks"],"video/x-mng":["mng"],"video/x-ms-asf":["asf","asx"],"video/x-ms-vob":["vob"],"video/x-ms-wm":["wm"],"video/x-ms-wmv":["wmv"],"video/x-ms-wmx":["wmx"],"video/x-ms-wvx":["wvx"],"video/x-msvideo":["avi"],"video/x-sgi-movie":["movie"],"video/x-smv":["smv"],"x-conference/x-cooltalk":["ice"]} +{"application/andrew-inset":["ez"],"application/applixware":["aw"],"application/atom+xml":["atom"],"application/atomcat+xml":["atomcat"],"application/atomsvc+xml":["atomsvc"],"application/bdoc":["bdoc"],"application/ccxml+xml":["ccxml"],"application/cdmi-capability":["cdmia"],"application/cdmi-container":["cdmic"],"application/cdmi-domain":["cdmid"],"application/cdmi-object":["cdmio"],"application/cdmi-queue":["cdmiq"],"application/cu-seeme":["cu"],"application/dash+xml":["mpd"],"application/davmount+xml":["davmount"],"application/docbook+xml":["dbk"],"application/dssc+der":["dssc"],"application/dssc+xml":["xdssc"],"application/ecmascript":["ecma"],"application/emma+xml":["emma"],"application/epub+zip":["epub"],"application/exi":["exi"],"application/font-tdpfr":["pfr"],"application/font-woff":["woff"],"application/font-woff2":["woff2"],"application/geo+json":["geojson"],"application/gml+xml":["gml"],"application/gpx+xml":["gpx"],"application/gxf":["gxf"],"application/gzip":["gz"],"application/hyperstudio":["stk"],"application/inkml+xml":["ink","inkml"],"application/ipfix":["ipfix"],"application/java-archive":["jar","war","ear"],"application/java-serialized-object":["ser"],"application/java-vm":["class"],"application/javascript":["js","mjs"],"application/json":["json","map"],"application/json5":["json5"],"application/jsonml+json":["jsonml"],"application/ld+json":["jsonld"],"application/lost+xml":["lostxml"],"application/mac-binhex40":["hqx"],"application/mac-compactpro":["cpt"],"application/mads+xml":["mads"],"application/manifest+json":["webmanifest"],"application/marc":["mrc"],"application/marcxml+xml":["mrcx"],"application/mathematica":["ma","nb","mb"],"application/mathml+xml":["mathml"],"application/mbox":["mbox"],"application/mediaservercontrol+xml":["mscml"],"application/metalink+xml":["metalink"],"application/metalink4+xml":["meta4"],"application/mets+xml":["mets"],"application/mods+xml":["mods"],"application/mp21":["m21","mp21"],"application/mp4":["mp4s","m4p"],"application/msword":["doc","dot"],"application/mxf":["mxf"],"application/octet-stream":["bin","dms","lrf","mar","so","dist","distz","pkg","bpk","dump","elc","deploy","exe","dll","deb","dmg","iso","img","msi","msp","msm","buffer"],"application/oda":["oda"],"application/oebps-package+xml":["opf"],"application/ogg":["ogx"],"application/omdoc+xml":["omdoc"],"application/onenote":["onetoc","onetoc2","onetmp","onepkg"],"application/oxps":["oxps"],"application/patch-ops-error+xml":["xer"],"application/pdf":["pdf"],"application/pgp-encrypted":["pgp"],"application/pgp-signature":["asc","sig"],"application/pics-rules":["prf"],"application/pkcs10":["p10"],"application/pkcs7-mime":["p7m","p7c"],"application/pkcs7-signature":["p7s"],"application/pkcs8":["p8"],"application/pkix-attr-cert":["ac"],"application/pkix-cert":["cer"],"application/pkix-crl":["crl"],"application/pkix-pkipath":["pkipath"],"application/pkixcmp":["pki"],"application/pls+xml":["pls"],"application/postscript":["ai","eps","ps"],"application/prs.cww":["cww"],"application/pskc+xml":["pskcxml"],"application/rdf+xml":["rdf"],"application/reginfo+xml":["rif"],"application/relax-ng-compact-syntax":["rnc"],"application/resource-lists+xml":["rl"],"application/resource-lists-diff+xml":["rld"],"application/rls-services+xml":["rs"],"application/rpki-ghostbusters":["gbr"],"application/rpki-manifest":["mft"],"application/rpki-roa":["roa"],"application/rsd+xml":["rsd"],"application/rss+xml":["rss"],"application/rtf":["rtf"],"application/sbml+xml":["sbml"],"application/scvp-cv-request":["scq"],"application/scvp-cv-response":["scs"],"application/scvp-vp-request":["spq"],"application/scvp-vp-response":["spp"],"application/sdp":["sdp"],"application/set-payment-initiation":["setpay"],"application/set-registration-initiation":["setreg"],"application/shf+xml":["shf"],"application/smil+xml":["smi","smil"],"application/sparql-query":["rq"],"application/sparql-results+xml":["srx"],"application/srgs":["gram"],"application/srgs+xml":["grxml"],"application/sru+xml":["sru"],"application/ssdl+xml":["ssdl"],"application/ssml+xml":["ssml"],"application/tei+xml":["tei","teicorpus"],"application/thraud+xml":["tfi"],"application/timestamped-data":["tsd"],"application/vnd.3gpp.pic-bw-large":["plb"],"application/vnd.3gpp.pic-bw-small":["psb"],"application/vnd.3gpp.pic-bw-var":["pvb"],"application/vnd.3gpp2.tcap":["tcap"],"application/vnd.3m.post-it-notes":["pwn"],"application/vnd.accpac.simply.aso":["aso"],"application/vnd.accpac.simply.imp":["imp"],"application/vnd.acucobol":["acu"],"application/vnd.acucorp":["atc","acutc"],"application/vnd.adobe.air-application-installer-package+zip":["air"],"application/vnd.adobe.formscentral.fcdt":["fcdt"],"application/vnd.adobe.fxp":["fxp","fxpl"],"application/vnd.adobe.xdp+xml":["xdp"],"application/vnd.adobe.xfdf":["xfdf"],"application/vnd.ahead.space":["ahead"],"application/vnd.airzip.filesecure.azf":["azf"],"application/vnd.airzip.filesecure.azs":["azs"],"application/vnd.amazon.ebook":["azw"],"application/vnd.americandynamics.acc":["acc"],"application/vnd.amiga.ami":["ami"],"application/vnd.android.package-archive":["apk"],"application/vnd.anser-web-certificate-issue-initiation":["cii"],"application/vnd.anser-web-funds-transfer-initiation":["fti"],"application/vnd.antix.game-component":["atx"],"application/vnd.apple.installer+xml":["mpkg"],"application/vnd.apple.mpegurl":["m3u8"],"application/vnd.apple.pkpass":["pkpass"],"application/vnd.aristanetworks.swi":["swi"],"application/vnd.astraea-software.iota":["iota"],"application/vnd.audiograph":["aep"],"application/vnd.blueice.multipass":["mpm"],"application/vnd.bmi":["bmi"],"application/vnd.businessobjects":["rep"],"application/vnd.chemdraw+xml":["cdxml"],"application/vnd.chipnuts.karaoke-mmd":["mmd"],"application/vnd.cinderella":["cdy"],"application/vnd.claymore":["cla"],"application/vnd.cloanto.rp9":["rp9"],"application/vnd.clonk.c4group":["c4g","c4d","c4f","c4p","c4u"],"application/vnd.cluetrust.cartomobile-config":["c11amc"],"application/vnd.cluetrust.cartomobile-config-pkg":["c11amz"],"application/vnd.commonspace":["csp"],"application/vnd.contact.cmsg":["cdbcmsg"],"application/vnd.cosmocaller":["cmc"],"application/vnd.crick.clicker":["clkx"],"application/vnd.crick.clicker.keyboard":["clkk"],"application/vnd.crick.clicker.palette":["clkp"],"application/vnd.crick.clicker.template":["clkt"],"application/vnd.crick.clicker.wordbank":["clkw"],"application/vnd.criticaltools.wbs+xml":["wbs"],"application/vnd.ctc-posml":["pml"],"application/vnd.cups-ppd":["ppd"],"application/vnd.curl.car":["car"],"application/vnd.curl.pcurl":["pcurl"],"application/vnd.dart":["dart"],"application/vnd.data-vision.rdz":["rdz"],"application/vnd.dece.data":["uvf","uvvf","uvd","uvvd"],"application/vnd.dece.ttml+xml":["uvt","uvvt"],"application/vnd.dece.unspecified":["uvx","uvvx"],"application/vnd.dece.zip":["uvz","uvvz"],"application/vnd.denovo.fcselayout-link":["fe_launch"],"application/vnd.dna":["dna"],"application/vnd.dolby.mlp":["mlp"],"application/vnd.dpgraph":["dpg"],"application/vnd.dreamfactory":["dfac"],"application/vnd.ds-keypoint":["kpxx"],"application/vnd.dvb.ait":["ait"],"application/vnd.dvb.service":["svc"],"application/vnd.dynageo":["geo"],"application/vnd.ecowin.chart":["mag"],"application/vnd.enliven":["nml"],"application/vnd.epson.esf":["esf"],"application/vnd.epson.msf":["msf"],"application/vnd.epson.quickanime":["qam"],"application/vnd.epson.salt":["slt"],"application/vnd.epson.ssf":["ssf"],"application/vnd.eszigno3+xml":["es3","et3"],"application/vnd.ezpix-album":["ez2"],"application/vnd.ezpix-package":["ez3"],"application/vnd.fdf":["fdf"],"application/vnd.fdsn.mseed":["mseed"],"application/vnd.fdsn.seed":["seed","dataless"],"application/vnd.flographit":["gph"],"application/vnd.fluxtime.clip":["ftc"],"application/vnd.framemaker":["fm","frame","maker","book"],"application/vnd.frogans.fnc":["fnc"],"application/vnd.frogans.ltf":["ltf"],"application/vnd.fsc.weblaunch":["fsc"],"application/vnd.fujitsu.oasys":["oas"],"application/vnd.fujitsu.oasys2":["oa2"],"application/vnd.fujitsu.oasys3":["oa3"],"application/vnd.fujitsu.oasysgp":["fg5"],"application/vnd.fujitsu.oasysprs":["bh2"],"application/vnd.fujixerox.ddd":["ddd"],"application/vnd.fujixerox.docuworks":["xdw"],"application/vnd.fujixerox.docuworks.binder":["xbd"],"application/vnd.fuzzysheet":["fzs"],"application/vnd.genomatix.tuxedo":["txd"],"application/vnd.geogebra.file":["ggb"],"application/vnd.geogebra.tool":["ggt"],"application/vnd.geometry-explorer":["gex","gre"],"application/vnd.geonext":["gxt"],"application/vnd.geoplan":["g2w"],"application/vnd.geospace":["g3w"],"application/vnd.gmx":["gmx"],"application/vnd.google-apps.document":["gdoc"],"application/vnd.google-apps.presentation":["gslides"],"application/vnd.google-apps.spreadsheet":["gsheet"],"application/vnd.google-earth.kml+xml":["kml"],"application/vnd.google-earth.kmz":["kmz"],"application/vnd.grafeq":["gqf","gqs"],"application/vnd.groove-account":["gac"],"application/vnd.groove-help":["ghf"],"application/vnd.groove-identity-message":["gim"],"application/vnd.groove-injector":["grv"],"application/vnd.groove-tool-message":["gtm"],"application/vnd.groove-tool-template":["tpl"],"application/vnd.groove-vcard":["vcg"],"application/vnd.hal+xml":["hal"],"application/vnd.handheld-entertainment+xml":["zmm"],"application/vnd.hbci":["hbci"],"application/vnd.hhe.lesson-player":["les"],"application/vnd.hp-hpgl":["hpgl"],"application/vnd.hp-hpid":["hpid"],"application/vnd.hp-hps":["hps"],"application/vnd.hp-jlyt":["jlt"],"application/vnd.hp-pcl":["pcl"],"application/vnd.hp-pclxl":["pclxl"],"application/vnd.hydrostatix.sof-data":["sfd-hdstx"],"application/vnd.ibm.minipay":["mpy"],"application/vnd.ibm.modcap":["afp","listafp","list3820"],"application/vnd.ibm.rights-management":["irm"],"application/vnd.ibm.secure-container":["sc"],"application/vnd.iccprofile":["icc","icm"],"application/vnd.igloader":["igl"],"application/vnd.immervision-ivp":["ivp"],"application/vnd.immervision-ivu":["ivu"],"application/vnd.insors.igm":["igm"],"application/vnd.intercon.formnet":["xpw","xpx"],"application/vnd.intergeo":["i2g"],"application/vnd.intu.qbo":["qbo"],"application/vnd.intu.qfx":["qfx"],"application/vnd.ipunplugged.rcprofile":["rcprofile"],"application/vnd.irepository.package+xml":["irp"],"application/vnd.is-xpr":["xpr"],"application/vnd.isac.fcs":["fcs"],"application/vnd.jam":["jam"],"application/vnd.jcp.javame.midlet-rms":["rms"],"application/vnd.jisp":["jisp"],"application/vnd.joost.joda-archive":["joda"],"application/vnd.kahootz":["ktz","ktr"],"application/vnd.kde.karbon":["karbon"],"application/vnd.kde.kchart":["chrt"],"application/vnd.kde.kformula":["kfo"],"application/vnd.kde.kivio":["flw"],"application/vnd.kde.kontour":["kon"],"application/vnd.kde.kpresenter":["kpr","kpt"],"application/vnd.kde.kspread":["ksp"],"application/vnd.kde.kword":["kwd","kwt"],"application/vnd.kenameaapp":["htke"],"application/vnd.kidspiration":["kia"],"application/vnd.kinar":["kne","knp"],"application/vnd.koan":["skp","skd","skt","skm"],"application/vnd.kodak-descriptor":["sse"],"application/vnd.las.las+xml":["lasxml"],"application/vnd.llamagraphics.life-balance.desktop":["lbd"],"application/vnd.llamagraphics.life-balance.exchange+xml":["lbe"],"application/vnd.lotus-1-2-3":["123"],"application/vnd.lotus-approach":["apr"],"application/vnd.lotus-freelance":["pre"],"application/vnd.lotus-notes":["nsf"],"application/vnd.lotus-organizer":["org"],"application/vnd.lotus-screencam":["scm"],"application/vnd.lotus-wordpro":["lwp"],"application/vnd.macports.portpkg":["portpkg"],"application/vnd.mcd":["mcd"],"application/vnd.medcalcdata":["mc1"],"application/vnd.mediastation.cdkey":["cdkey"],"application/vnd.mfer":["mwf"],"application/vnd.mfmp":["mfm"],"application/vnd.micrografx.flo":["flo"],"application/vnd.micrografx.igx":["igx"],"application/vnd.mif":["mif"],"application/vnd.mobius.daf":["daf"],"application/vnd.mobius.dis":["dis"],"application/vnd.mobius.mbk":["mbk"],"application/vnd.mobius.mqy":["mqy"],"application/vnd.mobius.msl":["msl"],"application/vnd.mobius.plc":["plc"],"application/vnd.mobius.txf":["txf"],"application/vnd.mophun.application":["mpn"],"application/vnd.mophun.certificate":["mpc"],"application/vnd.mozilla.xul+xml":["xul"],"application/vnd.ms-artgalry":["cil"],"application/vnd.ms-cab-compressed":["cab"],"application/vnd.ms-excel":["xls","xlm","xla","xlc","xlt","xlw"],"application/vnd.ms-excel.addin.macroenabled.12":["xlam"],"application/vnd.ms-excel.sheet.binary.macroenabled.12":["xlsb"],"application/vnd.ms-excel.sheet.macroenabled.12":["xlsm"],"application/vnd.ms-excel.template.macroenabled.12":["xltm"],"application/vnd.ms-fontobject":["eot"],"application/vnd.ms-htmlhelp":["chm"],"application/vnd.ms-ims":["ims"],"application/vnd.ms-lrm":["lrm"],"application/vnd.ms-officetheme":["thmx"],"application/vnd.ms-outlook":["msg"],"application/vnd.ms-pki.seccat":["cat"],"application/vnd.ms-pki.stl":["stl"],"application/vnd.ms-powerpoint":["ppt","pps","pot"],"application/vnd.ms-powerpoint.addin.macroenabled.12":["ppam"],"application/vnd.ms-powerpoint.presentation.macroenabled.12":["pptm"],"application/vnd.ms-powerpoint.slide.macroenabled.12":["sldm"],"application/vnd.ms-powerpoint.slideshow.macroenabled.12":["ppsm"],"application/vnd.ms-powerpoint.template.macroenabled.12":["potm"],"application/vnd.ms-project":["mpp","mpt"],"application/vnd.ms-word.document.macroenabled.12":["docm"],"application/vnd.ms-word.template.macroenabled.12":["dotm"],"application/vnd.ms-works":["wps","wks","wcm","wdb"],"application/vnd.ms-wpl":["wpl"],"application/vnd.ms-xpsdocument":["xps"],"application/vnd.mseq":["mseq"],"application/vnd.musician":["mus"],"application/vnd.muvee.style":["msty"],"application/vnd.mynfc":["taglet"],"application/vnd.neurolanguage.nlu":["nlu"],"application/vnd.nitf":["ntf","nitf"],"application/vnd.noblenet-directory":["nnd"],"application/vnd.noblenet-sealer":["nns"],"application/vnd.noblenet-web":["nnw"],"application/vnd.nokia.n-gage.data":["ngdat"],"application/vnd.nokia.n-gage.symbian.install":["n-gage"],"application/vnd.nokia.radio-preset":["rpst"],"application/vnd.nokia.radio-presets":["rpss"],"application/vnd.novadigm.edm":["edm"],"application/vnd.novadigm.edx":["edx"],"application/vnd.novadigm.ext":["ext"],"application/vnd.oasis.opendocument.chart":["odc"],"application/vnd.oasis.opendocument.chart-template":["otc"],"application/vnd.oasis.opendocument.database":["odb"],"application/vnd.oasis.opendocument.formula":["odf"],"application/vnd.oasis.opendocument.formula-template":["odft"],"application/vnd.oasis.opendocument.graphics":["odg"],"application/vnd.oasis.opendocument.graphics-template":["otg"],"application/vnd.oasis.opendocument.image":["odi"],"application/vnd.oasis.opendocument.image-template":["oti"],"application/vnd.oasis.opendocument.presentation":["odp"],"application/vnd.oasis.opendocument.presentation-template":["otp"],"application/vnd.oasis.opendocument.spreadsheet":["ods"],"application/vnd.oasis.opendocument.spreadsheet-template":["ots"],"application/vnd.oasis.opendocument.text":["odt"],"application/vnd.oasis.opendocument.text-master":["odm"],"application/vnd.oasis.opendocument.text-template":["ott"],"application/vnd.oasis.opendocument.text-web":["oth"],"application/vnd.olpc-sugar":["xo"],"application/vnd.oma.dd2+xml":["dd2"],"application/vnd.openofficeorg.extension":["oxt"],"application/vnd.openxmlformats-officedocument.presentationml.presentation":["pptx"],"application/vnd.openxmlformats-officedocument.presentationml.slide":["sldx"],"application/vnd.openxmlformats-officedocument.presentationml.slideshow":["ppsx"],"application/vnd.openxmlformats-officedocument.presentationml.template":["potx"],"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet":["xlsx"],"application/vnd.openxmlformats-officedocument.spreadsheetml.template":["xltx"],"application/vnd.openxmlformats-officedocument.wordprocessingml.document":["docx"],"application/vnd.openxmlformats-officedocument.wordprocessingml.template":["dotx"],"application/vnd.osgeo.mapguide.package":["mgp"],"application/vnd.osgi.dp":["dp"],"application/vnd.osgi.subsystem":["esa"],"application/vnd.palm":["pdb","pqa","oprc"],"application/vnd.pawaafile":["paw"],"application/vnd.pg.format":["str"],"application/vnd.pg.osasli":["ei6"],"application/vnd.picsel":["efif"],"application/vnd.pmi.widget":["wg"],"application/vnd.pocketlearn":["plf"],"application/vnd.powerbuilder6":["pbd"],"application/vnd.previewsystems.box":["box"],"application/vnd.proteus.magazine":["mgz"],"application/vnd.publishare-delta-tree":["qps"],"application/vnd.pvi.ptid1":["ptid"],"application/vnd.quark.quarkxpress":["qxd","qxt","qwd","qwt","qxl","qxb"],"application/vnd.realvnc.bed":["bed"],"application/vnd.recordare.musicxml":["mxl"],"application/vnd.recordare.musicxml+xml":["musicxml"],"application/vnd.rig.cryptonote":["cryptonote"],"application/vnd.rim.cod":["cod"],"application/vnd.rn-realmedia":["rm"],"application/vnd.rn-realmedia-vbr":["rmvb"],"application/vnd.route66.link66+xml":["link66"],"application/vnd.sailingtracker.track":["st"],"application/vnd.seemail":["see"],"application/vnd.sema":["sema"],"application/vnd.semd":["semd"],"application/vnd.semf":["semf"],"application/vnd.shana.informed.formdata":["ifm"],"application/vnd.shana.informed.formtemplate":["itp"],"application/vnd.shana.informed.interchange":["iif"],"application/vnd.shana.informed.package":["ipk"],"application/vnd.simtech-mindmapper":["twd","twds"],"application/vnd.smaf":["mmf"],"application/vnd.smart.teacher":["teacher"],"application/vnd.solent.sdkm+xml":["sdkm","sdkd"],"application/vnd.spotfire.dxp":["dxp"],"application/vnd.spotfire.sfs":["sfs"],"application/vnd.stardivision.calc":["sdc"],"application/vnd.stardivision.draw":["sda"],"application/vnd.stardivision.impress":["sdd"],"application/vnd.stardivision.math":["smf"],"application/vnd.stardivision.writer":["sdw","vor"],"application/vnd.stardivision.writer-global":["sgl"],"application/vnd.stepmania.package":["smzip"],"application/vnd.stepmania.stepchart":["sm"],"application/vnd.sun.wadl+xml":["wadl"],"application/vnd.sun.xml.calc":["sxc"],"application/vnd.sun.xml.calc.template":["stc"],"application/vnd.sun.xml.draw":["sxd"],"application/vnd.sun.xml.draw.template":["std"],"application/vnd.sun.xml.impress":["sxi"],"application/vnd.sun.xml.impress.template":["sti"],"application/vnd.sun.xml.math":["sxm"],"application/vnd.sun.xml.writer":["sxw"],"application/vnd.sun.xml.writer.global":["sxg"],"application/vnd.sun.xml.writer.template":["stw"],"application/vnd.sus-calendar":["sus","susp"],"application/vnd.svd":["svd"],"application/vnd.symbian.install":["sis","sisx"],"application/vnd.syncml+xml":["xsm"],"application/vnd.syncml.dm+wbxml":["bdm"],"application/vnd.syncml.dm+xml":["xdm"],"application/vnd.tao.intent-module-archive":["tao"],"application/vnd.tcpdump.pcap":["pcap","cap","dmp"],"application/vnd.tmobile-livetv":["tmo"],"application/vnd.trid.tpt":["tpt"],"application/vnd.triscape.mxs":["mxs"],"application/vnd.trueapp":["tra"],"application/vnd.ufdl":["ufd","ufdl"],"application/vnd.uiq.theme":["utz"],"application/vnd.umajin":["umj"],"application/vnd.unity":["unityweb"],"application/vnd.uoml+xml":["uoml"],"application/vnd.vcx":["vcx"],"application/vnd.visio":["vsd","vst","vss","vsw"],"application/vnd.visionary":["vis"],"application/vnd.vsf":["vsf"],"application/vnd.wap.wbxml":["wbxml"],"application/vnd.wap.wmlc":["wmlc"],"application/vnd.wap.wmlscriptc":["wmlsc"],"application/vnd.webturbo":["wtb"],"application/vnd.wolfram.player":["nbp"],"application/vnd.wordperfect":["wpd"],"application/vnd.wqd":["wqd"],"application/vnd.wt.stf":["stf"],"application/vnd.xara":["xar"],"application/vnd.xfdl":["xfdl"],"application/vnd.yamaha.hv-dic":["hvd"],"application/vnd.yamaha.hv-script":["hvs"],"application/vnd.yamaha.hv-voice":["hvp"],"application/vnd.yamaha.openscoreformat":["osf"],"application/vnd.yamaha.openscoreformat.osfpvg+xml":["osfpvg"],"application/vnd.yamaha.smaf-audio":["saf"],"application/vnd.yamaha.smaf-phrase":["spf"],"application/vnd.yellowriver-custom-menu":["cmp"],"application/vnd.zul":["zir","zirz"],"application/vnd.zzazz.deck+xml":["zaz"],"application/voicexml+xml":["vxml"],"application/widget":["wgt"],"application/winhlp":["hlp"],"application/wsdl+xml":["wsdl"],"application/wspolicy+xml":["wspolicy"],"application/x-7z-compressed":["7z"],"application/x-abiword":["abw"],"application/x-ace-compressed":["ace"],"application/x-apple-diskimage":["dmg"],"application/x-arj":["arj"],"application/x-authorware-bin":["aab","x32","u32","vox"],"application/x-authorware-map":["aam"],"application/x-authorware-seg":["aas"],"application/x-bcpio":["bcpio"],"application/x-bdoc":["bdoc"],"application/x-bittorrent":["torrent"],"application/x-blorb":["blb","blorb"],"application/x-bzip":["bz"],"application/x-bzip2":["bz2","boz"],"application/x-cbr":["cbr","cba","cbt","cbz","cb7"],"application/x-cdlink":["vcd"],"application/x-cfs-compressed":["cfs"],"application/x-chat":["chat"],"application/x-chess-pgn":["pgn"],"application/x-chrome-extension":["crx"],"application/x-cocoa":["cco"],"application/x-conference":["nsc"],"application/x-cpio":["cpio"],"application/x-csh":["csh"],"application/x-debian-package":["deb","udeb"],"application/x-dgc-compressed":["dgc"],"application/x-director":["dir","dcr","dxr","cst","cct","cxt","w3d","fgd","swa"],"application/x-doom":["wad"],"application/x-dtbncx+xml":["ncx"],"application/x-dtbook+xml":["dtb"],"application/x-dtbresource+xml":["res"],"application/x-dvi":["dvi"],"application/x-envoy":["evy"],"application/x-eva":["eva"],"application/x-font-bdf":["bdf"],"application/x-font-ghostscript":["gsf"],"application/x-font-linux-psf":["psf"],"application/x-font-otf":["otf"],"application/x-font-pcf":["pcf"],"application/x-font-snf":["snf"],"application/x-font-ttf":["ttf","ttc"],"application/x-font-type1":["pfa","pfb","pfm","afm"],"application/x-freearc":["arc"],"application/x-futuresplash":["spl"],"application/x-gca-compressed":["gca"],"application/x-glulx":["ulx"],"application/x-gnumeric":["gnumeric"],"application/x-gramps-xml":["gramps"],"application/x-gtar":["gtar"],"application/x-hdf":["hdf"],"application/x-httpd-php":["php"],"application/x-install-instructions":["install"],"application/x-iso9660-image":["iso"],"application/x-java-archive-diff":["jardiff"],"application/x-java-jnlp-file":["jnlp"],"application/x-latex":["latex"],"application/x-lua-bytecode":["luac"],"application/x-lzh-compressed":["lzh","lha"],"application/x-makeself":["run"],"application/x-mie":["mie"],"application/x-mobipocket-ebook":["prc","mobi"],"application/x-ms-application":["application"],"application/x-ms-shortcut":["lnk"],"application/x-ms-wmd":["wmd"],"application/x-ms-wmz":["wmz"],"application/x-ms-xbap":["xbap"],"application/x-msaccess":["mdb"],"application/x-msbinder":["obd"],"application/x-mscardfile":["crd"],"application/x-msclip":["clp"],"application/x-msdos-program":["exe"],"application/x-msdownload":["exe","dll","com","bat","msi"],"application/x-msmediaview":["mvb","m13","m14"],"application/x-msmetafile":["wmf","wmz","emf","emz"],"application/x-msmoney":["mny"],"application/x-mspublisher":["pub"],"application/x-msschedule":["scd"],"application/x-msterminal":["trm"],"application/x-mswrite":["wri"],"application/x-netcdf":["nc","cdf"],"application/x-ns-proxy-autoconfig":["pac"],"application/x-nzb":["nzb"],"application/x-perl":["pl","pm"],"application/x-pilot":["prc","pdb"],"application/x-pkcs12":["p12","pfx"],"application/x-pkcs7-certificates":["p7b","spc"],"application/x-pkcs7-certreqresp":["p7r"],"application/x-rar-compressed":["rar"],"application/x-redhat-package-manager":["rpm"],"application/x-research-info-systems":["ris"],"application/x-sea":["sea"],"application/x-sh":["sh"],"application/x-shar":["shar"],"application/x-shockwave-flash":["swf"],"application/x-silverlight-app":["xap"],"application/x-sql":["sql"],"application/x-stuffit":["sit"],"application/x-stuffitx":["sitx"],"application/x-subrip":["srt"],"application/x-sv4cpio":["sv4cpio"],"application/x-sv4crc":["sv4crc"],"application/x-t3vm-image":["t3"],"application/x-tads":["gam"],"application/x-tar":["tar"],"application/x-tcl":["tcl","tk"],"application/x-tex":["tex"],"application/x-tex-tfm":["tfm"],"application/x-texinfo":["texinfo","texi"],"application/x-tgif":["obj"],"application/x-ustar":["ustar"],"application/x-virtualbox-hdd":["hdd"],"application/x-virtualbox-ova":["ova"],"application/x-virtualbox-ovf":["ovf"],"application/x-virtualbox-vbox":["vbox"],"application/x-virtualbox-vbox-extpack":["vbox-extpack"],"application/x-virtualbox-vdi":["vdi"],"application/x-virtualbox-vhd":["vhd"],"application/x-virtualbox-vmdk":["vmdk"],"application/x-wais-source":["src"],"application/x-web-app-manifest+json":["webapp"],"application/x-x509-ca-cert":["der","crt","pem"],"application/x-xfig":["fig"],"application/x-xliff+xml":["xlf"],"application/x-xpinstall":["xpi"],"application/x-xz":["xz"],"application/x-zmachine":["z1","z2","z3","z4","z5","z6","z7","z8"],"application/xaml+xml":["xaml"],"application/xcap-diff+xml":["xdf"],"application/xenc+xml":["xenc"],"application/xhtml+xml":["xhtml","xht"],"application/xml":["xml","xsl","xsd","rng"],"application/xml-dtd":["dtd"],"application/xop+xml":["xop"],"application/xproc+xml":["xpl"],"application/xslt+xml":["xslt"],"application/xspf+xml":["xspf"],"application/xv+xml":["mxml","xhvml","xvml","xvm"],"application/yang":["yang"],"application/yin+xml":["yin"],"application/zip":["zip"],"audio/3gpp":["3gpp"],"audio/adpcm":["adp"],"audio/basic":["au","snd"],"audio/midi":["mid","midi","kar","rmi"],"audio/mp3":["mp3"],"audio/mp4":["m4a","mp4a"],"audio/mpeg":["mpga","mp2","mp2a","mp3","m2a","m3a"],"audio/ogg":["oga","ogg","spx"],"audio/s3m":["s3m"],"audio/silk":["sil"],"audio/vnd.dece.audio":["uva","uvva"],"audio/vnd.digital-winds":["eol"],"audio/vnd.dra":["dra"],"audio/vnd.dts":["dts"],"audio/vnd.dts.hd":["dtshd"],"audio/vnd.lucent.voice":["lvp"],"audio/vnd.ms-playready.media.pya":["pya"],"audio/vnd.nuera.ecelp4800":["ecelp4800"],"audio/vnd.nuera.ecelp7470":["ecelp7470"],"audio/vnd.nuera.ecelp9600":["ecelp9600"],"audio/vnd.rip":["rip"],"audio/wav":["wav"],"audio/wave":["wav"],"audio/webm":["weba"],"audio/x-aac":["aac"],"audio/x-aiff":["aif","aiff","aifc"],"audio/x-caf":["caf"],"audio/x-flac":["flac"],"audio/x-m4a":["m4a"],"audio/x-matroska":["mka"],"audio/x-mpegurl":["m3u"],"audio/x-ms-wax":["wax"],"audio/x-ms-wma":["wma"],"audio/x-pn-realaudio":["ram","ra"],"audio/x-pn-realaudio-plugin":["rmp"],"audio/x-realaudio":["ra"],"audio/x-wav":["wav"],"audio/xm":["xm"],"chemical/x-cdx":["cdx"],"chemical/x-cif":["cif"],"chemical/x-cmdf":["cmdf"],"chemical/x-cml":["cml"],"chemical/x-csml":["csml"],"chemical/x-xyz":["xyz"],"font/otf":["otf"],"image/apng":["apng"],"image/bmp":["bmp"],"image/cgm":["cgm"],"image/g3fax":["g3"],"image/gif":["gif"],"image/ief":["ief"],"image/jpeg":["jpeg","jpg","jpe"],"image/ktx":["ktx"],"image/png":["png"],"image/prs.btif":["btif"],"image/sgi":["sgi"],"image/svg+xml":["svg","svgz"],"image/tiff":["tiff","tif"],"image/vnd.adobe.photoshop":["psd"],"image/vnd.dece.graphic":["uvi","uvvi","uvg","uvvg"],"image/vnd.djvu":["djvu","djv"],"image/vnd.dvb.subtitle":["sub"],"image/vnd.dwg":["dwg"],"image/vnd.dxf":["dxf"],"image/vnd.fastbidsheet":["fbs"],"image/vnd.fpx":["fpx"],"image/vnd.fst":["fst"],"image/vnd.fujixerox.edmics-mmr":["mmr"],"image/vnd.fujixerox.edmics-rlc":["rlc"],"image/vnd.ms-modi":["mdi"],"image/vnd.ms-photo":["wdp"],"image/vnd.net-fpx":["npx"],"image/vnd.wap.wbmp":["wbmp"],"image/vnd.xiff":["xif"],"image/webp":["webp"],"image/x-3ds":["3ds"],"image/x-cmu-raster":["ras"],"image/x-cmx":["cmx"],"image/x-freehand":["fh","fhc","fh4","fh5","fh7"],"image/x-icon":["ico"],"image/x-jng":["jng"],"image/x-mrsid-image":["sid"],"image/x-ms-bmp":["bmp"],"image/x-pcx":["pcx"],"image/x-pict":["pic","pct"],"image/x-portable-anymap":["pnm"],"image/x-portable-bitmap":["pbm"],"image/x-portable-graymap":["pgm"],"image/x-portable-pixmap":["ppm"],"image/x-rgb":["rgb"],"image/x-tga":["tga"],"image/x-xbitmap":["xbm"],"image/x-xpixmap":["xpm"],"image/x-xwindowdump":["xwd"],"message/rfc822":["eml","mime"],"model/gltf+json":["gltf"],"model/gltf-binary":["glb"],"model/iges":["igs","iges"],"model/mesh":["msh","mesh","silo"],"model/vnd.collada+xml":["dae"],"model/vnd.dwf":["dwf"],"model/vnd.gdl":["gdl"],"model/vnd.gtw":["gtw"],"model/vnd.mts":["mts"],"model/vnd.vtu":["vtu"],"model/vrml":["wrl","vrml"],"model/x3d+binary":["x3db","x3dbz"],"model/x3d+vrml":["x3dv","x3dvz"],"model/x3d+xml":["x3d","x3dz"],"text/cache-manifest":["appcache","manifest"],"text/calendar":["ics","ifb"],"text/coffeescript":["coffee","litcoffee"],"text/css":["css"],"text/csv":["csv"],"text/hjson":["hjson"],"text/html":["html","htm","shtml"],"text/jade":["jade"],"text/jsx":["jsx"],"text/less":["less"],"text/markdown":["markdown","md"],"text/mathml":["mml"],"text/n3":["n3"],"text/plain":["txt","text","conf","def","list","log","in","ini"],"text/prs.lines.tag":["dsc"],"text/richtext":["rtx"],"text/rtf":["rtf"],"text/sgml":["sgml","sgm"],"text/slim":["slim","slm"],"text/stylus":["stylus","styl"],"text/tab-separated-values":["tsv"],"text/troff":["t","tr","roff","man","me","ms"],"text/turtle":["ttl"],"text/uri-list":["uri","uris","urls"],"text/vcard":["vcard"],"text/vnd.curl":["curl"],"text/vnd.curl.dcurl":["dcurl"],"text/vnd.curl.mcurl":["mcurl"],"text/vnd.curl.scurl":["scurl"],"text/vnd.dvb.subtitle":["sub"],"text/vnd.fly":["fly"],"text/vnd.fmi.flexstor":["flx"],"text/vnd.graphviz":["gv"],"text/vnd.in3d.3dml":["3dml"],"text/vnd.in3d.spot":["spot"],"text/vnd.sun.j2me.app-descriptor":["jad"],"text/vnd.wap.wml":["wml"],"text/vnd.wap.wmlscript":["wmls"],"text/vtt":["vtt"],"text/x-asm":["s","asm"],"text/x-c":["c","cc","cxx","cpp","h","hh","dic"],"text/x-component":["htc"],"text/x-fortran":["f","for","f77","f90"],"text/x-handlebars-template":["hbs"],"text/x-java-source":["java"],"text/x-lua":["lua"],"text/x-markdown":["mkd"],"text/x-nfo":["nfo"],"text/x-opml":["opml"],"text/x-org":["org"],"text/x-pascal":["p","pas"],"text/x-processing":["pde"],"text/x-sass":["sass"],"text/x-scss":["scss"],"text/x-setext":["etx"],"text/x-sfv":["sfv"],"text/x-suse-ymp":["ymp"],"text/x-uuencode":["uu"],"text/x-vcalendar":["vcs"],"text/x-vcard":["vcf"],"text/xml":["xml"],"text/yaml":["yaml","yml"],"video/3gpp":["3gp","3gpp"],"video/3gpp2":["3g2"],"video/h261":["h261"],"video/h263":["h263"],"video/h264":["h264"],"video/jpeg":["jpgv"],"video/jpm":["jpm","jpgm"],"video/mj2":["mj2","mjp2"],"video/mp2t":["ts"],"video/mp4":["mp4","mp4v","mpg4"],"video/mpeg":["mpeg","mpg","mpe","m1v","m2v"],"video/ogg":["ogv"],"video/quicktime":["qt","mov"],"video/vnd.dece.hd":["uvh","uvvh"],"video/vnd.dece.mobile":["uvm","uvvm"],"video/vnd.dece.pd":["uvp","uvvp"],"video/vnd.dece.sd":["uvs","uvvs"],"video/vnd.dece.video":["uvv","uvvv"],"video/vnd.dvb.file":["dvb"],"video/vnd.fvt":["fvt"],"video/vnd.mpegurl":["mxu","m4u"],"video/vnd.ms-playready.media.pyv":["pyv"],"video/vnd.uvvu.mp4":["uvu","uvvu"],"video/vnd.vivo":["viv"],"video/webm":["webm"],"video/x-f4v":["f4v"],"video/x-fli":["fli"],"video/x-flv":["flv"],"video/x-m4v":["m4v"],"video/x-matroska":["mkv","mk3d","mks"],"video/x-mng":["mng"],"video/x-ms-asf":["asf","asx"],"video/x-ms-vob":["vob"],"video/x-ms-wm":["wm"],"video/x-ms-wmv":["wmv"],"video/x-ms-wmx":["wmx"],"video/x-ms-wvx":["wvx"],"video/x-msvideo":["avi"],"video/x-sgi-movie":["movie"],"video/x-smv":["smv"],"x-conference/x-cooltalk":["ice"]} diff --git a/nodejs/node_modules/minimist/package.json b/nodejs/node_modules/minimist/package.json index 9985fe48b..92f4e3509 100644 --- a/nodejs/node_modules/minimist/package.json +++ b/nodejs/node_modules/minimist/package.json @@ -1,46 +1,32 @@ { "_args": [ [ - { - "raw": "minimist@^1.1.0", - "scope": null, - "escapedName": "minimist", - "name": "minimist", - "rawSpec": "^1.1.0", - "spec": ">=1.1.0 <2.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio" + "minimist@1.2.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "minimist@>=1.1.0 <2.0.0", + "_from": "minimist@1.2.0", "_id": "minimist@1.2.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "_location": "/minimist", - "_nodeVersion": "2.4.0", - "_npmUser": { - "name": "substack", - "email": "substack@gmail.com" - }, - "_npmVersion": "3.2.2", "_phantomChildren": {}, "_requested": { - "raw": "minimist@^1.1.0", - "scope": null, - "escapedName": "minimist", + "type": "version", + "registry": true, + "raw": "minimist@1.2.0", "name": "minimist", - "rawSpec": "^1.1.0", - "spec": ">=1.1.0 <2.0.0", - "type": "range" + "escapedName": "minimist", + "rawSpec": "1.2.0", + "saveSpec": null, + "fetchSpec": "1.2.0" }, "_requiredBy": [ "/webcast-osx-audio" ], "_resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "_shasum": "a35008b20f41383eec1fb914f4cd5df79a264284", - "_shrinkwrap": null, - "_spec": "minimist@^1.1.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio", + "_spec": "1.2.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "James Halliday", "email": "mail@substack.net", @@ -49,19 +35,12 @@ "bugs": { "url": "https://github.com/substack/minimist/issues" }, - "dependencies": {}, "description": "parse argument options", "devDependencies": { "covert": "^1.0.0", "tap": "~0.4.0", "tape": "^3.5.0" }, - "directories": {}, - "dist": { - "shasum": "a35008b20f41383eec1fb914f4cd5df79a264284", - "tarball": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" - }, - "gitHead": "dc624482fcfec5bc669c68cdb861f00573ed4e64", "homepage": "https://github.com/substack/minimist", "keywords": [ "argv", @@ -71,15 +50,7 @@ ], "license": "MIT", "main": "index.js", - "maintainers": [ - { - "name": "substack", - "email": "mail@substack.net" - } - ], "name": "minimist", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/substack/minimist.git" diff --git a/nodejs/node_modules/ms/README.md b/nodejs/node_modules/ms/README.md index 5b475707d..84a9974cc 100644 --- a/nodejs/node_modules/ms/README.md +++ b/nodejs/node_modules/ms/README.md @@ -1,8 +1,7 @@ # ms [![Build Status](https://travis-ci.org/zeit/ms.svg?branch=master)](https://travis-ci.org/zeit/ms) -[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo) -[![Slack Channel](https://zeit-slackin.now.sh/badge.svg)](https://zeit.chat/) +[![Slack Channel](http://zeit-slackin.now.sh/badge.svg)](https://zeit.chat/) Use this package to easily convert various time formats to milliseconds. diff --git a/nodejs/node_modules/ms/index.js b/nodejs/node_modules/ms/index.js index e904c7054..6a522b16b 100644 --- a/nodejs/node_modules/ms/index.js +++ b/nodejs/node_modules/ms/index.js @@ -2,11 +2,11 @@ * Helpers. */ -var s = 1000 -var m = s * 60 -var h = m * 60 -var d = h * 24 -var y = d * 365.25 +var s = 1000; +var m = s * 60; +var h = m * 60; +var d = h * 24; +var y = d * 365.25; /** * Parse or format the given `val`. @@ -22,18 +22,19 @@ var y = d * 365.25 * @api public */ -module.exports = function (val, options) { - options = options || {} - var type = typeof val +module.exports = function(val, options) { + options = options || {}; + var type = typeof val; if (type === 'string' && val.length > 0) { - return parse(val) + return parse(val); } else if (type === 'number' && isNaN(val) === false) { - return options.long ? - fmtLong(val) : - fmtShort(val) + return options.long ? fmtLong(val) : fmtShort(val); } - throw new Error('val is not a non-empty string or a valid number. val=' + JSON.stringify(val)) -} + throw new Error( + 'val is not a non-empty string or a valid number. val=' + + JSON.stringify(val) + ); +}; /** * Parse the given `str` and return milliseconds. @@ -44,53 +45,55 @@ module.exports = function (val, options) { */ function parse(str) { - str = String(str) - if (str.length > 10000) { - return + str = String(str); + if (str.length > 100) { + return; } - var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str) + var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec( + str + ); if (!match) { - return + return; } - var n = parseFloat(match[1]) - var type = (match[2] || 'ms').toLowerCase() + var n = parseFloat(match[1]); + var type = (match[2] || 'ms').toLowerCase(); switch (type) { case 'years': case 'year': case 'yrs': case 'yr': case 'y': - return n * y + return n * y; case 'days': case 'day': case 'd': - return n * d + return n * d; case 'hours': case 'hour': case 'hrs': case 'hr': case 'h': - return n * h + return n * h; case 'minutes': case 'minute': case 'mins': case 'min': case 'm': - return n * m + return n * m; case 'seconds': case 'second': case 'secs': case 'sec': case 's': - return n * s + return n * s; case 'milliseconds': case 'millisecond': case 'msecs': case 'msec': case 'ms': - return n + return n; default: - return undefined + return undefined; } } @@ -104,18 +107,18 @@ function parse(str) { function fmtShort(ms) { if (ms >= d) { - return Math.round(ms / d) + 'd' + return Math.round(ms / d) + 'd'; } if (ms >= h) { - return Math.round(ms / h) + 'h' + return Math.round(ms / h) + 'h'; } if (ms >= m) { - return Math.round(ms / m) + 'm' + return Math.round(ms / m) + 'm'; } if (ms >= s) { - return Math.round(ms / s) + 's' + return Math.round(ms / s) + 's'; } - return ms + 'ms' + return ms + 'ms'; } /** @@ -131,7 +134,7 @@ function fmtLong(ms) { plural(ms, h, 'hour') || plural(ms, m, 'minute') || plural(ms, s, 'second') || - ms + ' ms' + ms + ' ms'; } /** @@ -140,10 +143,10 @@ function fmtLong(ms) { function plural(ms, n, name) { if (ms < n) { - return + return; } if (ms < n * 1.5) { - return Math.floor(ms / n) + ' ' + name + return Math.floor(ms / n) + ' ' + name; } - return Math.ceil(ms / n) + ' ' + name + 's' + return Math.ceil(ms / n) + ' ' + name + 's'; } diff --git a/nodejs/node_modules/ms/package.json b/nodejs/node_modules/ms/package.json index 6ae5f966b..b564502d9 100644 --- a/nodejs/node_modules/ms/package.json +++ b/nodejs/node_modules/ms/package.json @@ -1,109 +1,73 @@ { "_args": [ [ - { - "raw": "ms@0.7.3", - "scope": null, - "escapedName": "ms", - "name": "ms", - "rawSpec": "0.7.3", - "spec": "0.7.3", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/debug" + "ms@2.0.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "ms@0.7.3", - "_id": "ms@0.7.3", - "_inCache": true, + "_from": "ms@2.0.0", + "_id": "ms@2.0.0", + "_inBundle": false, + "_integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "_location": "/ms", - "_nodeVersion": "7.6.0", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/ms-0.7.3.tgz_1489010366101_0.14404030703008175" - }, - "_npmUser": { - "name": "leo", - "email": "leo@zeit.co" - }, - "_npmVersion": "4.1.2", "_phantomChildren": {}, "_requested": { - "raw": "ms@0.7.3", - "scope": null, - "escapedName": "ms", + "type": "version", + "registry": true, + "raw": "ms@2.0.0", "name": "ms", - "rawSpec": "0.7.3", - "spec": "0.7.3", - "type": "version" + "escapedName": "ms", + "rawSpec": "2.0.0", + "saveSpec": null, + "fetchSpec": "2.0.0" }, "_requiredBy": [ "/debug", - "/finalhandler/debug" + "/send" ], - "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz", - "_shasum": "708155a5e44e33f5fd0fc53e81d0d40a91be1fff", - "_shrinkwrap": null, - "_spec": "ms@0.7.3", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/debug", + "_resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "_spec": "2.0.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/zeit/ms/issues" }, - "component": { - "scripts": { - "ms/index.js": "index.js" - } - }, - "dependencies": {}, "description": "Tiny milisecond conversion utility", "devDependencies": { + "eslint": "3.19.0", "expect.js": "0.3.1", - "mocha": "3.0.2", - "serve": "5.0.1", - "xo": "0.17.0" + "husky": "0.13.3", + "lint-staged": "3.4.1", + "mocha": "3.4.1" }, - "directories": {}, - "dist": { - "shasum": "708155a5e44e33f5fd0fc53e81d0d40a91be1fff", - "tarball": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz" + "eslintConfig": { + "extends": "eslint:recommended", + "env": { + "node": true, + "es6": true + } }, "files": [ "index.js" ], - "gitHead": "2006a7706041443fcf1f899b5752677bd7ae01a8", "homepage": "https://github.com/zeit/ms#readme", "license": "MIT", + "lint-staged": { + "*.js": [ + "npm run lint", + "prettier --single-quote --write", + "git add" + ] + }, "main": "./index", - "maintainers": [ - { - "name": "leo", - "email": "leo@zeit.co" - }, - { - "name": "rauchg", - "email": "rauchg@gmail.com" - } - ], "name": "ms", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/zeit/ms.git" }, "scripts": { - "test": "xo && mocha test/index.js", - "test-browser": "serve ./test" + "lint": "eslint lib/* bin/*", + "precommit": "lint-staged", + "test": "mocha tests.js" }, - "version": "0.7.3", - "xo": { - "space": true, - "semicolon": false, - "envs": [ - "mocha" - ], - "rules": { - "complexity": 0 - } - } + "version": "2.0.0" } diff --git a/nodejs/node_modules/nan/CHANGELOG.md b/nodejs/node_modules/nan/CHANGELOG.md index fb8087ceb..4e04975fe 100644 --- a/nodejs/node_modules/nan/CHANGELOG.md +++ b/nodejs/node_modules/nan/CHANGELOG.md @@ -1,6 +1,19 @@ # NAN ChangeLog -**Version 2.6.2: current Node 7.9.0, Node 12: 0.12.18, Node 10: 0.10.48, iojs: 3.3.1** +**Version 2.8.0: current Node 9.2.0, Node 12: 0.12.18, Node 10: 0.10.48, iojs: 3.3.1** + +### 2.8.0 Nov 15 2017 + + - Deprecation: Deprecate `Nan::ForceSet` in favor of `Nan::DefineOwnProperty()` 95cbb976d6fbbba88ba0f86dd188223a8591b4e7 + - Feature: Add `Nan::AsyncProgressQueueWorker` a976636ecc2ef617d1b061ce4a6edf39923691cb + - Feature: Add `Nan::DefineOwnProperty()` 95cbb976d6fbbba88ba0f86dd188223a8591b4e7 + - Bugfix: Fix compiling on io.js 1 & 2 82705a64503ce60c62e98df5bd02972bba090900 + - Bugfix: Use DefineOwnProperty instead of ForceSet 95cbb976d6fbbba88ba0f86dd188223a8591b4e7 + +### 2.7.0 Aug 30 2017 + + - Feature: Add `Nan::To()` overload. b93280670c9f6da42ed4cf6cbf085ffdd87bd65b + - Bugfix: Fix ternary in `Nan::MaybeLocal::FromMaybe()`. 79a26f7d362e756a9524e672a82c3d603b542867 ### 2.6.2 Apr 12 2017 diff --git a/nodejs/node_modules/nan/README.md b/nodejs/node_modules/nan/README.md index 79504c0e4..a93d3910b 100644 --- a/nodejs/node_modules/nan/README.md +++ b/nodejs/node_modules/nan/README.md @@ -1,9 +1,9 @@ Native Abstractions for Node.js =============================== -**A header file filled with macro and utility goodness for making add-on development for Node.js easier across versions 0.8, 0.10, 0.12, 1, 2, 3, 4, 5, 6 and 7.** +**A header file filled with macro and utility goodness for making add-on development for Node.js easier across versions 0.8, 0.10, 0.12, 1, 2, 3, 4, 5, 6, 7, 8 and 9.** -***Current version: 2.6.2*** +***Current version: 2.8.0*** *(See [CHANGELOG.md](https://github.com/nodejs/nan/blob/master/CHANGELOG.md) for complete ChangeLog)* @@ -76,7 +76,7 @@ Additional to the NAN documentation below, please consult: ### JavaScript-accessible methods -A _template_ is a blueprint for JavaScript functions and objects in a context. You can use a template to wrap C++ functions and data structures within JavaScript objects so that they can be manipulated from JavaScript. See the V8 Embedders Guide section on [Templates](https://developers.google.com/v8/embed#templates) for further information. +A _template_ is a blueprint for JavaScript functions and objects in a context. You can use a template to wrap C++ functions and data structures within JavaScript objects so that they can be manipulated from JavaScript. See the V8 Embedders Guide section on [Templates](https://github.com/v8/v8/wiki/Embedder%27s-Guide#templates) for further information. In order to expose functionality to JavaScript via a template, you must provide it to V8 in a form that it understands. Across the versions of V8 supported by NAN, JavaScript-accessible method signatures vary widely, NAN fully abstracts method declaration and provides you with an interface that is similar to the most recent V8 API but is backward-compatible with older versions that still use the now-deceased `v8::Argument` type. @@ -174,7 +174,8 @@ The `Nan::MaybeLocal` and `Nan::Maybe` types are monads that encapsulate `v8::Lo - Nan::NewInstance() - Nan::GetFunction() - Nan::Set() - - Nan::ForceSet() + - Nan::DefineOwnProperty() + - Nan::ForceSet() - Nan::Get() - Nan::GetPropertyAttributes() - Nan::Has() @@ -258,10 +259,11 @@ NAN's `node::Buffer` helpers exist as the API has changed across supported Node ### Asynchronous work helpers -`Nan::AsyncWorker` and `Nan::AsyncProgressWorker` are helper classes that make working with asynchronous code easier. +`Nan::AsyncWorker`, `Nan::AsyncProgressWorker` and `Nan::AsyncProgressQueueWorker` are helper classes that make working with asynchronous code easier. - Nan::AsyncWorker - Nan::AsyncProgressWorkerBase & Nan::AsyncProgressWorker + - Nan::AsyncProgressQueueWorker - Nan::AsyncQueueWorker ### Strings & Bytes @@ -343,13 +345,13 @@ make test ## Governance & Contributing -NAN is governed by the [io.js](https://iojs.org/) Addon API Working Group +NAN is governed by the [Node.js Addon API Working Group](https://github.com/nodejs/CTC/blob/master/WORKING_GROUPS.md#addon-api) ### Addon API Working Group (WG) The NAN project is jointly governed by a Working Group which is responsible for high-level guidance of the project. -Members of the WG are also known as Collaborators, there is no distinction between the two, unlike other io.js projects. +Members of the WG are also known as Collaborators, there is no distinction between the two, unlike other Node.js projects. The WG has final authority over this project including: @@ -415,6 +417,7 @@ By making a contribution to this project, I certify that: Brett LawsonGitHub/brett19Twitter/@brett19x Ben NoordhuisGitHub/bnoordhuisTwitter/@bnoordhuis David SiegelGitHub/agnatTwitter/@agnat +Michael Ira KrufkyGitHub/mkrufkyTwitter/@mkrufky ## Licence & copyright diff --git a/nodejs/node_modules/nan/doc/asyncworker.md b/nodejs/node_modules/nan/doc/asyncworker.md index 53a78dd46..b75cb4be4 100644 --- a/nodejs/node_modules/nan/doc/asyncworker.md +++ b/nodejs/node_modules/nan/doc/asyncworker.md @@ -1,9 +1,10 @@ ## Asynchronous work helpers -`Nan::AsyncWorker` and `Nan::AsyncProgressWorker` are helper classes that make working with asynchronous code easier. +`Nan::AsyncWorker`, `Nan::AsyncProgressWorker` and `Nan::AsyncProgressQueueWorker` are helper classes that make working with asynchronous code easier. - Nan::AsyncWorker - Nan::AsyncProgressWorkerBase & Nan::AsyncProgressWorker + - Nan::AsyncProgressQueueWorker - Nan::AsyncQueueWorker @@ -64,6 +65,8 @@ class AsyncWorker { Previously the definiton of `Nan::AsyncProgressWorker` only allowed sending `const char` data. Now extending `Nan::AsyncProgressWorker` will yield an instance of the implicit `Nan::AsyncProgressWorkerBase` template with type `` for compatibility. +`Nan::AsyncProgressWorkerBase` & `Nan::AsyncProgressWorker` is intended for best-effort delivery of nonessential progress messages, e.g. a progress bar. The last event sent before the main thread is woken will be delivered. + Definition: ```c++ @@ -79,18 +82,51 @@ class AsyncProgressWorkerBase : public AsyncWorker { class ExecutionProgress { public: void Signal() const; - void Send(const T* data, size_t size) const; + void Send(const T* data, size_t count) const; }; virtual void Execute(const ExecutionProgress& progress) = 0; - virtual void HandleProgressCallback(const T *data, size_t size) = 0; + virtual void HandleProgressCallback(const T *data, size_t count) = 0; virtual void Destroy(); +}; typedef AsyncProgressWorkerBase AsyncProgressWorker; ``` + +### Nan::AsyncProgressQueueWorker + +`Nan::AsyncProgressQueueWorker` is an _abstract_ class template that extends `Nan::AsyncWorker` and adds additional progress reporting callbacks that can be used during the asynchronous work execution to provide progress data back to JavaScript. + +`Nan::AsyncProgressQueueWorker` behaves exactly the same as `Nan::AsyncProgressWorker`, except all events are queued and delivered to the main thread. + +Definition: + +```c++ +template +class AsyncProgressQueueWorker : public AsyncWorker { + public: + explicit AsyncProgressQueueWorker(Callback *callback_); + + virtual ~AsyncProgressQueueWorker(); + + void WorkProgress(); + + class ExecutionProgress { + public: + void Send(const T* data, size_t count) const; + }; + + virtual void Execute(const ExecutionProgress& progress) = 0; + + virtual void HandleProgressCallback(const T *data, size_t count) = 0; + + virtual void Destroy(); +}; +``` + ### Nan::AsyncQueueWorker diff --git a/nodejs/node_modules/nan/doc/errors.md b/nodejs/node_modules/nan/doc/errors.md index aac6e087f..b93b3535c 100644 --- a/nodejs/node_modules/nan/doc/errors.md +++ b/nodejs/node_modules/nan/doc/errors.md @@ -24,7 +24,7 @@ Also consult the V8 Embedders Guide section on [Exceptions](https://developers.g ### Nan::Error() -Create a new Error object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.0/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. +Create a new Error object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.3/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. Note that an Error object is simply a specialized form of `v8::Value`. @@ -39,7 +39,7 @@ v8::Local Nan::Error(v8::Local msg); ### Nan::RangeError() -Create a new RangeError object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.0/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. +Create a new RangeError object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.3/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. Note that an RangeError object is simply a specialized form of `v8::Value`. @@ -54,7 +54,7 @@ v8::Local Nan::RangeError(v8::Local msg); ### Nan::ReferenceError() -Create a new ReferenceError object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.0/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. +Create a new ReferenceError object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.3/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. Note that an ReferenceError object is simply a specialized form of `v8::Value`. @@ -69,7 +69,7 @@ v8::Local Nan::ReferenceError(v8::Local msg); ### Nan::SyntaxError() -Create a new SyntaxError object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.0/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. +Create a new SyntaxError object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.3/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. Note that an SyntaxError object is simply a specialized form of `v8::Value`. @@ -84,7 +84,7 @@ v8::Local Nan::SyntaxError(v8::Local msg); ### Nan::TypeError() -Create a new TypeError object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.0/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. +Create a new TypeError object using the [v8::Exception](https://v8docs.nodesource.com/io.js-3.3/da/d6a/classv8_1_1_exception.html) class in a way that is compatible across the supported versions of V8. Note that an TypeError object is simply a specialized form of `v8::Value`. @@ -194,7 +194,7 @@ v8::Local Nan::ErrnoException(int errorno, ### Nan::TryCatch -A simple wrapper around [`v8::TryCatch`](https://v8docs.nodesource.com/io.js-3.0/d4/dc6/classv8_1_1_try_catch.html) compatible with all supported versions of V8. Can be used as a direct replacement in most cases. See also [`Nan::FatalException()`](#api_nan_fatal_exception) for an internal use compatible with `node::FatalException`. +A simple wrapper around [`v8::TryCatch`](https://v8docs.nodesource.com/io.js-3.3/d4/dc6/classv8_1_1_try_catch.html) compatible with all supported versions of V8. Can be used as a direct replacement in most cases. See also [`Nan::FatalException()`](#api_nan_fatal_exception) for an internal use compatible with `node::FatalException`. Signature: diff --git a/nodejs/node_modules/nan/doc/maybe_types.md b/nodejs/node_modules/nan/doc/maybe_types.md index 818861d73..5baa2cfb6 100644 --- a/nodejs/node_modules/nan/doc/maybe_types.md +++ b/nodejs/node_modules/nan/doc/maybe_types.md @@ -15,7 +15,8 @@ The `Nan::MaybeLocal` and `Nan::Maybe` types are monads that encapsulate `v8::Lo - Nan::NewInstance() - Nan::GetFunction() - Nan::Set() - - Nan::ForceSet() + - Nan::DefineOwnProperty() + - Nan::ForceSet() - Nan::Get() - Nan::GetPropertyAttributes() - Nan::Has() @@ -46,7 +47,7 @@ The `Nan::MaybeLocal` and `Nan::Maybe` types are monads that encapsulate `v8::Lo ### Nan::MaybeLocal -A `Nan::MaybeLocal` is a wrapper around [`v8::Local`](https://v8docs.nodesource.com/io.js-3.0/de/deb/classv8_1_1_local.html) that enforces a check that determines whether the `v8::Local` is empty before it can be used. +A `Nan::MaybeLocal` is a wrapper around [`v8::Local`](https://v8docs.nodesource.com/io.js-3.3/de/deb/classv8_1_1_local.html) that enforces a check that determines whether the `v8::Local` is empty before it can be used. If an API method returns a `Nan::MaybeLocal`, the API method can potentially fail either because an exception is thrown, or because an exception is pending, e.g. because a previous API call threw an exception that hasn't been caught yet, or because a `v8::TerminateExecution` exception was thrown. In that case, an empty `Nan::MaybeLocal` is returned. @@ -70,7 +71,7 @@ template class Nan::MaybeLocal { }; ``` -See the documentation for [`v8::MaybeLocal`](https://v8docs.nodesource.com/io.js-3.0/d8/d7d/classv8_1_1_maybe_local.html) for further details. +See the documentation for [`v8::MaybeLocal`](https://v8docs.nodesource.com/io.js-3.3/d8/d7d/classv8_1_1_maybe_local.html) for further details. ### Nan::Maybe @@ -98,7 +99,7 @@ template class Nan::Maybe { }; ``` -See the documentation for [`v8::Maybe`](https://v8docs.nodesource.com/io.js-3.0/d9/d4b/classv8_1_1_maybe.html) for further details. +See the documentation for [`v8::Maybe`](https://v8docs.nodesource.com/io.js-3.3/d9/d4b/classv8_1_1_maybe.html) for further details. ### Nan::Nothing @@ -121,7 +122,7 @@ template Nan::Maybe Nan::Just(const T &t); ### Nan::Call() -A helper method for calling [`v8::Function#Call()`](https://v8docs.nodesource.com/io.js-3.0/d5/d54/classv8_1_1_function.html#a468a89f737af0612db10132799c827c0) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Function#Call()`](https://v8docs.nodesource.com/io.js-3.3/d5/d54/classv8_1_1_function.html#a468a89f737af0612db10132799c827c0) in a way compatible across supported versions of V8. Signature: @@ -133,7 +134,7 @@ Nan::MaybeLocal Nan::Call(v8::Local fun, v8::Local ### Nan::ToDetailString() -A helper method for calling [`v8::Value#ToDetailString()`](https://v8docs.nodesource.com/io.js-3.0/dc/d0a/classv8_1_1_value.html#a2f9770296dc2c8d274bc8cc0dca243e5) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Value#ToDetailString()`](https://v8docs.nodesource.com/io.js-3.3/dc/d0a/classv8_1_1_value.html#a2f9770296dc2c8d274bc8cc0dca243e5) in a way compatible across supported versions of V8. Signature: @@ -145,7 +146,7 @@ Nan::MaybeLocal Nan::ToDetailString(v8::Local val); ### Nan::ToArrayIndex() -A helper method for calling [`v8::Value#ToArrayIndex()`](https://v8docs.nodesource.com/io.js-3.0/dc/d0a/classv8_1_1_value.html#acc5bbef3c805ec458470c0fcd6f13493) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Value#ToArrayIndex()`](https://v8docs.nodesource.com/io.js-3.3/dc/d0a/classv8_1_1_value.html#acc5bbef3c805ec458470c0fcd6f13493) in a way compatible across supported versions of V8. Signature: @@ -157,7 +158,7 @@ Nan::MaybeLocal Nan::ToArrayIndex(v8::Local val); ### Nan::Equals() -A helper method for calling [`v8::Value#Equals()`](https://v8docs.nodesource.com/io.js-3.0/dc/d0a/classv8_1_1_value.html#a0d9616ab2de899d4e3047c30a10c9285) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Value#Equals()`](https://v8docs.nodesource.com/io.js-3.3/dc/d0a/classv8_1_1_value.html#a0d9616ab2de899d4e3047c30a10c9285) in a way compatible across supported versions of V8. Signature: @@ -169,7 +170,7 @@ Nan::Maybe Nan::Equals(v8::Local a, v8::Local(b)); ### Nan::NewInstance() -A helper method for calling [`v8::Function#NewInstance()`](https://v8docs.nodesource.com/io.js-3.0/d5/d54/classv8_1_1_function.html#a691b13f7a553069732cbacf5ac8c62ec) and [`v8::ObjectTemplate#NewInstance()`](https://v8docs.nodesource.com/io.js-3.0/db/d5f/classv8_1_1_object_template.html#ad605a7543cfbc5dab54cdb0883d14ae4) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Function#NewInstance()`](https://v8docs.nodesource.com/io.js-3.3/d5/d54/classv8_1_1_function.html#a691b13f7a553069732cbacf5ac8c62ec) and [`v8::ObjectTemplate#NewInstance()`](https://v8docs.nodesource.com/io.js-3.3/db/d5f/classv8_1_1_object_template.html#ad605a7543cfbc5dab54cdb0883d14ae4) in a way compatible across supported versions of V8. Signature: @@ -183,7 +184,7 @@ Nan::MaybeLocal Nan::NewInstance(v8::Local h); ### Nan::GetFunction() -A helper method for calling [`v8::FunctionTemplate#GetFunction()`](https://v8docs.nodesource.com/io.js-3.0/d8/d83/classv8_1_1_function_template.html#a56d904662a86eca78da37d9bb0ed3705) in a way compatible across supported versions of V8. +A helper method for calling [`v8::FunctionTemplate#GetFunction()`](https://v8docs.nodesource.com/io.js-3.3/d8/d83/classv8_1_1_function_template.html#a56d904662a86eca78da37d9bb0ed3705) in a way compatible across supported versions of V8. Signature: @@ -195,7 +196,7 @@ Nan::MaybeLocal Nan::GetFunction(v8::Local t ### Nan::Set() -A helper method for calling [`v8::Object#Set()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a67604ea3734f170c66026064ea808f20) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#Set()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a67604ea3734f170c66026064ea808f20) in a way compatible across supported versions of V8. Signature: @@ -209,25 +210,42 @@ Nan::Maybe Nan::Set(v8::Local obj, ``` + +### Nan::DefineOwnProperty() + +A helper method for calling [`v8::Object#DefineOwnProperty()`](https://v8docs.nodesource.com/node-4.8/db/d85/classv8_1_1_object.html#a6f76b2ed605cb8f9185b92de0033a820) in a way compatible across supported versions of V8. + +Signature: + +```c++ +Nan::Maybe Nan::DefineOwnProperty(v8::Local obj, + v8::Local key, + v8::Local value, + v8::PropertyAttribute attribs = v8::None); +``` + + -### Nan::ForceSet() +### Nan::ForceSet() + +Deprecated, use Nan::DefineOwnProperty(). -A helper method for calling [`v8::Object#ForceSet()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a796b7b682896fb64bf1872747734e836) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#ForceSet()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a796b7b682896fb64bf1872747734e836) in a way compatible across supported versions of V8. Signature: ```c++ -Nan::Maybe Nan::ForceSet(v8::Local obj, - v8::Local key, - v8::Local value, - v8::PropertyAttribute attribs = v8::None); +NAN_DEPRECATED Nan::Maybe Nan::ForceSet(v8::Local obj, + v8::Local key, + v8::Local value, + v8::PropertyAttribute attribs = v8::None); ``` ### Nan::Get() -A helper method for calling [`v8::Object#Get()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a2565f03e736694f6b1e1cf22a0b4eac2) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#Get()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a2565f03e736694f6b1e1cf22a0b4eac2) in a way compatible across supported versions of V8. Signature: @@ -241,7 +259,7 @@ Nan::MaybeLocal Nan::Get(v8::Local obj, uint32_t index); ### Nan::GetPropertyAttributes() -A helper method for calling [`v8::Object#GetPropertyAttributes()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a9b898894da3d1db2714fd9325a54fe57) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#GetPropertyAttributes()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a9b898894da3d1db2714fd9325a54fe57) in a way compatible across supported versions of V8. Signature: @@ -255,7 +273,7 @@ Nan::Maybe Nan::GetPropertyAttributes( ### Nan::Has() -A helper method for calling [`v8::Object#Has()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#ab3c3d89ea7c2f9afd08965bd7299a41d) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#Has()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#ab3c3d89ea7c2f9afd08965bd7299a41d) in a way compatible across supported versions of V8. Signature: @@ -268,7 +286,7 @@ Nan::Maybe Nan::Has(v8::Local obj, uint32_t index); ### Nan::Delete() -A helper method for calling [`v8::Object#Delete()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a2fa0f5a592582434ed1ceceff7d891ef) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#Delete()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a2fa0f5a592582434ed1ceceff7d891ef) in a way compatible across supported versions of V8. Signature: @@ -282,7 +300,7 @@ Nan::Maybe Nan::Delete(v8::Local obj, uint32_t index); ### Nan::GetPropertyNames() -A helper method for calling [`v8::Object#GetPropertyNames()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#aced885270cfd2c956367b5eedc7fbfe8) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#GetPropertyNames()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#aced885270cfd2c956367b5eedc7fbfe8) in a way compatible across supported versions of V8. Signature: @@ -294,7 +312,7 @@ Nan::MaybeLocal Nan::GetPropertyNames(v8::Local obj); ### Nan::GetOwnPropertyNames() -A helper method for calling [`v8::Object#GetOwnPropertyNames()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a79a6e4d66049b9aa648ed4dfdb23e6eb) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#GetOwnPropertyNames()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a79a6e4d66049b9aa648ed4dfdb23e6eb) in a way compatible across supported versions of V8. Signature: @@ -306,7 +324,7 @@ Nan::MaybeLocal Nan::GetOwnPropertyNames(v8::Local obj); ### Nan::SetPrototype() -A helper method for calling [`v8::Object#SetPrototype()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a442706b22fceda6e6d1f632122a9a9f4) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#SetPrototype()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a442706b22fceda6e6d1f632122a9a9f4) in a way compatible across supported versions of V8. Signature: @@ -319,7 +337,7 @@ Nan::Maybe Nan::SetPrototype(v8::Local obj, ### Nan::ObjectProtoToString() -A helper method for calling [`v8::Object#ObjectProtoToString()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#ab7a92b4dcf822bef72f6c0ac6fea1f0b) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#ObjectProtoToString()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#ab7a92b4dcf822bef72f6c0ac6fea1f0b) in a way compatible across supported versions of V8. Signature: @@ -331,7 +349,7 @@ Nan::MaybeLocal Nan::ObjectProtoToString(v8::Local obj); ### Nan::HasOwnProperty() -A helper method for calling [`v8::Object#HasOwnProperty()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#ab7b7245442ca6de1e1c145ea3fd653ff) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#HasOwnProperty()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#ab7b7245442ca6de1e1c145ea3fd653ff) in a way compatible across supported versions of V8. Signature: @@ -344,7 +362,7 @@ Nan::Maybe Nan::HasOwnProperty(v8::Local obj, ### Nan::HasRealNamedProperty() -A helper method for calling [`v8::Object#HasRealNamedProperty()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#ad8b80a59c9eb3c1e6c3cd6c84571f767) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#HasRealNamedProperty()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#ad8b80a59c9eb3c1e6c3cd6c84571f767) in a way compatible across supported versions of V8. Signature: @@ -357,7 +375,7 @@ Nan::Maybe Nan::HasRealNamedProperty(v8::Local obj, ### Nan::HasRealIndexedProperty() -A helper method for calling [`v8::Object#HasRealIndexedProperty()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#af94fc1135a5e74a2193fb72c3a1b9855) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#HasRealIndexedProperty()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#af94fc1135a5e74a2193fb72c3a1b9855) in a way compatible across supported versions of V8. Signature: @@ -370,7 +388,7 @@ Nan::Maybe Nan::HasRealIndexedProperty(v8::Local obj, ### Nan::HasRealNamedCallbackProperty() -A helper method for calling [`v8::Object#HasRealNamedCallbackProperty()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#af743b7ea132b89f84d34d164d0668811) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#HasRealNamedCallbackProperty()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#af743b7ea132b89f84d34d164d0668811) in a way compatible across supported versions of V8. Signature: @@ -384,7 +402,7 @@ Nan::Maybe Nan::HasRealNamedCallbackProperty( ### Nan::GetRealNamedPropertyInPrototypeChain() -A helper method for calling [`v8::Object#GetRealNamedPropertyInPrototypeChain()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a8700b1862e6b4783716964ba4d5e6172) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#GetRealNamedPropertyInPrototypeChain()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a8700b1862e6b4783716964ba4d5e6172) in a way compatible across supported versions of V8. Signature: @@ -398,7 +416,7 @@ Nan::MaybeLocal Nan::GetRealNamedPropertyInPrototypeChain( ### Nan::GetRealNamedProperty() -A helper method for calling [`v8::Object#GetRealNamedProperty()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a84471a824576a5994fdd0ffcbf99ccc0) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#GetRealNamedProperty()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a84471a824576a5994fdd0ffcbf99ccc0) in a way compatible across supported versions of V8. Signature: @@ -411,7 +429,7 @@ Nan::MaybeLocal Nan::GetRealNamedProperty(v8::Local obj, ### Nan::CallAsFunction() -A helper method for calling [`v8::Object#CallAsFunction()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a9ef18be634e79b4f0cdffa1667a29f58) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#CallAsFunction()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a9ef18be634e79b4f0cdffa1667a29f58) in a way compatible across supported versions of V8. Signature: @@ -426,7 +444,7 @@ Nan::MaybeLocal Nan::CallAsFunction(v8::Local obj, ### Nan::CallAsConstructor() -A helper method for calling [`v8::Object#CallAsConstructor()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a50d571de50d0b0dfb28795619d07a01b) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Object#CallAsConstructor()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#a50d571de50d0b0dfb28795619d07a01b) in a way compatible across supported versions of V8. Signature: @@ -440,7 +458,7 @@ Nan::MaybeLocal Nan::CallAsConstructor(v8::Local obj, ### Nan::GetSourceLine() -A helper method for calling [`v8::Message#GetSourceLine()`](https://v8docs.nodesource.com/io.js-3.0/d9/d28/classv8_1_1_message.html#a849f7a6c41549d83d8159825efccd23a) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Message#GetSourceLine()`](https://v8docs.nodesource.com/io.js-3.3/d9/d28/classv8_1_1_message.html#a849f7a6c41549d83d8159825efccd23a) in a way compatible across supported versions of V8. Signature: @@ -452,7 +470,7 @@ Nan::MaybeLocal Nan::GetSourceLine(v8::Local msg); ### Nan::GetLineNumber() -A helper method for calling [`v8::Message#GetLineNumber()`](https://v8docs.nodesource.com/io.js-3.0/d9/d28/classv8_1_1_message.html#adbe46c10a88a6565f2732a2d2adf99b9) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Message#GetLineNumber()`](https://v8docs.nodesource.com/io.js-3.3/d9/d28/classv8_1_1_message.html#adbe46c10a88a6565f2732a2d2adf99b9) in a way compatible across supported versions of V8. Signature: @@ -464,7 +482,7 @@ Nan::Maybe Nan::GetLineNumber(v8::Local msg); ### Nan::GetStartColumn() -A helper method for calling [`v8::Message#GetStartColumn()`](https://v8docs.nodesource.com/io.js-3.0/d9/d28/classv8_1_1_message.html#a60ede616ba3822d712e44c7a74487ba6) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Message#GetStartColumn()`](https://v8docs.nodesource.com/io.js-3.3/d9/d28/classv8_1_1_message.html#a60ede616ba3822d712e44c7a74487ba6) in a way compatible across supported versions of V8. Signature: @@ -476,7 +494,7 @@ Nan::Maybe Nan::GetStartColumn(v8::Local msg); ### Nan::GetEndColumn() -A helper method for calling [`v8::Message#GetEndColumn()`](https://v8docs.nodesource.com/io.js-3.0/d9/d28/classv8_1_1_message.html#aaa004cf19e529da980bc19fcb76d93be) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Message#GetEndColumn()`](https://v8docs.nodesource.com/io.js-3.3/d9/d28/classv8_1_1_message.html#aaa004cf19e529da980bc19fcb76d93be) in a way compatible across supported versions of V8. Signature: @@ -488,7 +506,7 @@ Nan::Maybe Nan::GetEndColumn(v8::Local msg); ### Nan::CloneElementAt() -A helper method for calling [`v8::Array#CloneElementAt()`](https://v8docs.nodesource.com/io.js-3.0/d3/d32/classv8_1_1_array.html#a1d3a878d4c1c7cae974dd50a1639245e) in a way compatible across supported versions of V8. +A helper method for calling [`v8::Array#CloneElementAt()`](https://v8docs.nodesource.com/io.js-3.3/d3/d32/classv8_1_1_array.html#a1d3a878d4c1c7cae974dd50a1639245e) in a way compatible across supported versions of V8. Signature: diff --git a/nodejs/node_modules/nan/doc/methods.md b/nodejs/node_modules/nan/doc/methods.md index 0411a7056..bae46f26f 100644 --- a/nodejs/node_modules/nan/doc/methods.md +++ b/nodejs/node_modules/nan/doc/methods.md @@ -1,6 +1,6 @@ ## JavaScript-accessible methods -A _template_ is a blueprint for JavaScript functions and objects in a context. You can use a template to wrap C++ functions and data structures within JavaScript objects so that they can be manipulated from JavaScript. See the V8 Embedders Guide section on [Templates](https://developers.google.com/v8/embed#templates) for further information. +A _template_ is a blueprint for JavaScript functions and objects in a context. You can use a template to wrap C++ functions and data structures within JavaScript objects so that they can be manipulated from JavaScript. See the V8 Embedders Guide section on [Templates](https://github.com/v8/v8/wiki/Embedder%27s-Guide#templates) for further information. In order to expose functionality to JavaScript via a template, you must provide it to V8 in a form that it understands. Across the versions of V8 supported by NAN, JavaScript-accessible method signatures vary widely, NAN fully abstracts method declaration and provides you with an interface that is similar to the most recent V8 API but is backward-compatible with older versions that still use the now-deceased `v8::Argument` type. @@ -37,7 +37,7 @@ In order to expose functionality to JavaScript via a template, you must provide ### Nan::FunctionCallbackInfo -`Nan::FunctionCallbackInfo` should be used in place of [`v8::FunctionCallbackInfo`](https://v8docs.nodesource.com/io.js-3.0/dd/d0d/classv8_1_1_function_callback_info.html), even with older versions of Node where `v8::FunctionCallbackInfo` does not exist. +`Nan::FunctionCallbackInfo` should be used in place of [`v8::FunctionCallbackInfo`](https://v8docs.nodesource.com/node-8.0/dd/d0d/classv8_1_1_function_callback_info.html), even with older versions of Node where `v8::FunctionCallbackInfo` does not exist. Definition: @@ -56,12 +56,12 @@ template class FunctionCallbackInfo { }; ``` -See the [`v8::FunctionCallbackInfo`](https://v8docs.nodesource.com/io.js-3.0/dd/d0d/classv8_1_1_function_callback_info.html) documentation for usage details on these. See [`Nan::ReturnValue`](#api_nan_return_value) for further information on how to set a return value from methods. +See the [`v8::FunctionCallbackInfo`](https://v8docs.nodesource.com/node-8.0/dd/d0d/classv8_1_1_function_callback_info.html) documentation for usage details on these. See [`Nan::ReturnValue`](#api_nan_return_value) for further information on how to set a return value from methods. ### Nan::PropertyCallbackInfo -`Nan::PropertyCallbackInfo` should be used in place of [`v8::PropertyCallbackInfo`](https://v8docs.nodesource.com/io.js-3.0/d7/dc5/classv8_1_1_property_callback_info.html), even with older versions of Node where `v8::PropertyCallbackInfo` does not exist. +`Nan::PropertyCallbackInfo` should be used in place of [`v8::PropertyCallbackInfo`](https://v8docs.nodesource.com/node-8.0/d7/dc5/classv8_1_1_property_callback_info.html), even with older versions of Node where `v8::PropertyCallbackInfo` does not exist. Definition: @@ -76,12 +76,12 @@ template class PropertyCallbackInfo : public PropertyCallbackInfoBas }; ``` -See the [`v8::PropertyCallbackInfo`](https://v8docs.nodesource.com/io.js-3.0/d7/dc5/classv8_1_1_property_callback_info.html) documentation for usage details on these. See [`Nan::ReturnValue`](#api_nan_return_value) for further information on how to set a return value from property accessor methods. +See the [`v8::PropertyCallbackInfo`](https://v8docs.nodesource.com/node-8.0/d7/dc5/classv8_1_1_property_callback_info.html) documentation for usage details on these. See [`Nan::ReturnValue`](#api_nan_return_value) for further information on how to set a return value from property accessor methods. ### Nan::ReturnValue -`Nan::ReturnValue` is used in place of [`v8::ReturnValue`](https://v8docs.nodesource.com/io.js-3.0/da/da7/classv8_1_1_return_value.html) on both [`Nan::FunctionCallbackInfo`](#api_nan_function_callback_info) and [`Nan::PropertyCallbackInfo`](#api_nan_property_callback_info) as the return type of `GetReturnValue()`. +`Nan::ReturnValue` is used in place of [`v8::ReturnValue`](https://v8docs.nodesource.com/node-8.0/da/da7/classv8_1_1_return_value.html) on both [`Nan::FunctionCallbackInfo`](#api_nan_function_callback_info) and [`Nan::PropertyCallbackInfo`](#api_nan_property_callback_info) as the return type of `GetReturnValue()`. Example usage: @@ -116,7 +116,7 @@ template class ReturnValue { }; ``` -See the documentation on [`v8::ReturnValue`](https://v8docs.nodesource.com/io.js-3.0/da/da7/classv8_1_1_return_value.html) for further information on this. +See the documentation on [`v8::ReturnValue`](https://v8docs.nodesource.com/node-8.0/da/da7/classv8_1_1_return_value.html) for further information on this. ### Method declaration @@ -520,7 +520,7 @@ bool SetAccessor(v8::Local obj, v8::PropertyAttribute attribute = v8::None) ``` -See the V8 [`ObjectTemplate#SetAccessor()`](https://v8docs.nodesource.com/io.js-3.0/db/d5f/classv8_1_1_object_template.html#aa90691622f01269c6a11391d372ca0c5) and [`Object#SetAccessor()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#a3f9dee085f5ec346465f1dc924325043) for further information about how to use `Nan::SetAccessor()`. +See the V8 [`ObjectTemplate#SetAccessor()`](https://v8docs.nodesource.com/node-8.0/db/d5f/classv8_1_1_object_template.html#aca0ed196f8a9adb1f68b1aadb6c9cd77) and [`Object#SetAccessor()`](https://v8docs.nodesource.com/node-8.0/db/d85/classv8_1_1_object.html#a3f9dee085f5ec346465f1dc924325043) for further information about how to use `Nan::SetAccessor()`. ### Nan::SetNamedPropertyHandler() @@ -545,7 +545,7 @@ void SetNamedPropertyHandler(v8::Local tpl, v8::Local data = v8::Local()) ``` -See the V8 [`ObjectTemplate#SetNamedPropertyHandler()`](https://v8docs.nodesource.com/io.js-3.0/db/d5f/classv8_1_1_object_template.html#a34d1cc45b642cd131706663801aadd76) for further information about how to use `Nan::SetNamedPropertyHandler()`. +See the V8 [`ObjectTemplate#SetNamedPropertyHandler()`](https://v8docs.nodesource.com/io.js-3.3/db/d5f/classv8_1_1_object_template.html#a34d1cc45b642cd131706663801aadd76) for further information about how to use `Nan::SetNamedPropertyHandler()`. ### Nan::SetIndexedPropertyHandler() @@ -570,7 +570,7 @@ void SetIndexedPropertyHandler(v8::Local tpl, v8::Local data = v8::Local()) ``` -See the V8 [`ObjectTemplate#SetIndexedPropertyHandler()`](https://v8docs.nodesource.com/io.js-3.0/db/d5f/classv8_1_1_object_template.html#ac0234cbede45d51778bb5f6a32a9e125) for further information about how to use `Nan::SetIndexedPropertyHandler()`. +See the V8 [`ObjectTemplate#SetIndexedPropertyHandler()`](https://v8docs.nodesource.com/node-8.0/db/d5f/classv8_1_1_object_template.html#ac89f06d634add0e890452033f7d17ff1) for further information about how to use `Nan::SetIndexedPropertyHandler()`. ### Nan::SetTemplate() @@ -589,7 +589,7 @@ void Nan::SetTemplate(v8::Local templ, v8::PropertyAttribute attributes) ``` -Calls the `Template`'s [`Set()`](https://v8docs.nodesource.com/io.js-3.0/db/df7/classv8_1_1_template.html#a2db6a56597bf23c59659c0659e564ddf). +Calls the `Template`'s [`Set()`](https://v8docs.nodesource.com/node-8.0/db/df7/classv8_1_1_template.html#ae3fbaff137557aa6a0233bc7e52214ac). ### Nan::SetPrototypeTemplate() @@ -608,7 +608,7 @@ void Nan::SetPrototypeTemplate(v8::Local templ, v8::PropertyAttribute attributes) ``` -Calls the `FunctionTemplate`'s _PrototypeTemplate's_ [`Set()`](https://v8docs.nodesource.com/io.js-3.0/db/df7/classv8_1_1_template.html#a2db6a56597bf23c59659c0659e564ddf). +Calls the `FunctionTemplate`'s _PrototypeTemplate's_ [`Set()`](https://v8docs.nodesource.com/io.js-3.3/db/df7/classv8_1_1_template.html#a2db6a56597bf23c59659c0659e564ddf). ### Nan::SetInstanceTemplate() @@ -627,7 +627,7 @@ void Nan::SetInstanceTemplate(v8::Local templ, v8::PropertyAttribute attributes) ``` -Calls the `FunctionTemplate`'s _InstanceTemplate's_ [`Set()`](https://v8docs.nodesource.com/io.js-3.0/db/df7/classv8_1_1_template.html#a2db6a56597bf23c59659c0659e564ddf). +Calls the `FunctionTemplate`'s _InstanceTemplate's_ [`Set()`](https://v8docs.nodesource.com/io.js-3.3/db/df7/classv8_1_1_template.html#a2db6a56597bf23c59659c0659e564ddf). ### Nan::SetCallHandler() @@ -641,7 +641,7 @@ Signature: void Nan::SetCallHandler(v8::Local templ, Nan::FunctionCallback callback, v8::Local data = v8::Local()) ``` -Calls the `FunctionTemplate`'s [`SetCallHandler()`](https://v8docs.nodesource.com/io.js-3.0/d8/d83/classv8_1_1_function_template.html#a26cf14e36aa1a47091b98536d08ea821). +Calls the `FunctionTemplate`'s [`SetCallHandler()`](https://v8docs.nodesource.com/node-8.0/d8/d83/classv8_1_1_function_template.html#a2d3845db66392074c5a018a66efbfada). ### Nan::SetCallAsFunctionHandler() @@ -655,5 +655,5 @@ Signature: void Nan::SetCallAsFunctionHandler(v8::Local templ, Nan::FunctionCallback callback, v8::Local data = v8::Local()) ``` -Calls the `ObjectTemplate`'s [`SetCallAsFunctionHandler()`](https://v8docs.nodesource.com/io.js-3.0/db/d5f/classv8_1_1_object_template.html#ae0a0e72fb0c5e5f32e255fe5bcc7316a). +Calls the `ObjectTemplate`'s [`SetCallAsFunctionHandler()`](https://v8docs.nodesource.com/node-8.0/db/d5f/classv8_1_1_object_template.html#a5e9612fc80bf6db8f2da199b9b0bd04e). diff --git a/nodejs/node_modules/nan/doc/new.md b/nodejs/node_modules/nan/doc/new.md index c0734bd73..0804b62f9 100644 --- a/nodejs/node_modules/nan/doc/new.md +++ b/nodejs/node_modules/nan/doc/new.md @@ -15,7 +15,7 @@ NAN provides a `Nan::New()` helper for the creation of new JavaScript objects in `Nan::New()` should be used to instantiate new JavaScript objects. -Refer to the specific V8 type in the [V8 documentation](https://v8docs.nodesource.com/io.js-3.0/d1/d83/classv8_1_1_data.html) for information on the types of arguments required for instantiation. +Refer to the specific V8 type in the [V8 documentation](https://v8docs.nodesource.com/io.js-3.3/d1/d83/classv8_1_1_data.html) for information on the types of arguments required for instantiation. Signatures: @@ -75,7 +75,7 @@ v8::Local Nan::New(Nan::ExternalOneByteStringResource * value); v8::Local Nan::New(v8::Local pattern, v8::RegExp::Flags flags); ``` -Note that `Nan::ExternalOneByteStringResource` maps to [`v8::String::ExternalOneByteStringResource`](https://v8docs.nodesource.com/io.js-3.0/d9/db3/classv8_1_1_string_1_1_external_one_byte_string_resource.html), and `v8::String::ExternalAsciiStringResource` in older versions of V8. +Note that `Nan::ExternalOneByteStringResource` maps to [`v8::String::ExternalOneByteStringResource`](https://v8docs.nodesource.com/io.js-3.3/d9/db3/classv8_1_1_string_1_1_external_one_byte_string_resource.html), and `v8::String::ExternalAsciiStringResource` in older versions of V8. @@ -125,7 +125,7 @@ v8::Local Nan::False() ### Nan::EmptyString() -Call [`v8::String::Empty`](https://v8docs.nodesource.com/io.js-3.0/d2/db3/classv8_1_1_string.html#a7c1bc8886115d7ee46f1d571dd6ebc6d) to reference the empty string in a way that is compatible across all supported versions of V8. +Call [`v8::String::Empty`](https://v8docs.nodesource.com/io.js-3.3/d2/db3/classv8_1_1_string.html#a7c1bc8886115d7ee46f1d571dd6ebc6d) to reference the empty string in a way that is compatible across all supported versions of V8. Signature: @@ -137,7 +137,7 @@ v8::Local Nan::EmptyString() ### Nan::NewOneByteString() -An implementation of [`v8::String::NewFromOneByte()`](https://v8docs.nodesource.com/io.js-3.0/d2/db3/classv8_1_1_string.html#a5264d50b96d2c896ce525a734dc10f09) provided for consistent availability and API across supported versions of V8. Allocates a new string from Latin-1 data. +An implementation of [`v8::String::NewFromOneByte()`](https://v8docs.nodesource.com/io.js-3.3/d2/db3/classv8_1_1_string.html#a5264d50b96d2c896ce525a734dc10f09) provided for consistent availability and API across supported versions of V8. Allocates a new string from Latin-1 data. Signature: diff --git a/nodejs/node_modules/nan/doc/persistent.md b/nodejs/node_modules/nan/doc/persistent.md index 743b44a4c..f6ebefa0b 100644 --- a/nodejs/node_modules/nan/doc/persistent.md +++ b/nodejs/node_modules/nan/doc/persistent.md @@ -93,7 +93,7 @@ template class PersistentBase { }; ``` -See the V8 documentation for [`PersistentBase`](https://v8docs.nodesource.com/io.js-3.0/d4/dca/classv8_1_1_persistent_base.html) for further information. +See the V8 documentation for [`PersistentBase`](https://v8docs.nodesource.com/io.js-3.3/d4/dca/classv8_1_1_persistent_base.html) for further information. **Tip:** To get a `v8::Local` reference to the original object back from a `PersistentBase` or `Persistent` object: @@ -125,7 +125,7 @@ template class NonCopyablePersistentTraits { }; ``` -See the V8 documentation for [`NonCopyablePersistentTraits`](https://v8docs.nodesource.com/io.js-3.0/de/d73/classv8_1_1_non_copyable_persistent_traits.html) for further information. +See the V8 documentation for [`NonCopyablePersistentTraits`](https://v8docs.nodesource.com/io.js-3.3/de/d73/classv8_1_1_non_copyable_persistent_traits.html) for further information. ### Nan::CopyablePersistentTraits & v8::CopyablePersistentTraits @@ -150,7 +150,7 @@ class CopyablePersistentTraits { }; ``` -See the V8 documentation for [`CopyablePersistentTraits`](https://v8docs.nodesource.com/io.js-3.0/da/d5c/structv8_1_1_copyable_persistent_traits.html) for further information. +See the V8 documentation for [`CopyablePersistentTraits`](https://v8docs.nodesource.com/io.js-3.3/da/d5c/structv8_1_1_copyable_persistent_traits.html) for further information. ### Nan::Persistent @@ -203,7 +203,7 @@ template class Persistent : public PersistentBase { }; ``` -See the V8 documentation for [`Persistent`](https://v8docs.nodesource.com/io.js-3.0/d2/d78/classv8_1_1_persistent.html) for further information. +See the V8 documentation for [`Persistent`](https://v8docs.nodesource.com/io.js-3.3/d2/d78/classv8_1_1_persistent.html) for further information. ### Nan::Global @@ -237,7 +237,7 @@ template class Global : public PersistentBase { }; ``` -See the V8 documentation for [`Global`](https://v8docs.nodesource.com/io.js-3.0/d5/d40/classv8_1_1_global.html) for further information. +See the V8 documentation for [`Global`](https://v8docs.nodesource.com/io.js-3.3/d5/d40/classv8_1_1_global.html) for further information. ### Nan::WeakCallbackInfo @@ -278,7 +278,7 @@ int *data = new int(0); obj.SetWeak(data, callback, WeakCallbackType::kParameter); ``` -See the V8 documentation for [`WeakCallbackInfo`](https://v8docs.nodesource.com/io.js-3.0/d8/d06/classv8_1_1_weak_callback_info.html) for further information. +See the V8 documentation for [`WeakCallbackInfo`](https://v8docs.nodesource.com/io.js-3.3/d8/d06/classv8_1_1_weak_callback_info.html) for further information. ### Nan::WeakCallbackType diff --git a/nodejs/node_modules/nan/doc/scopes.md b/nodejs/node_modules/nan/doc/scopes.md index 060c8e4d0..1dfb417c6 100644 --- a/nodejs/node_modules/nan/doc/scopes.md +++ b/nodejs/node_modules/nan/doc/scopes.md @@ -14,7 +14,7 @@ Also see the V8 Embedders Guide section on [Handles and Garbage Collection](http ### Nan::HandleScope -A simple wrapper around [`v8::HandleScope`](https://v8docs.nodesource.com/io.js-3.0/d3/d95/classv8_1_1_handle_scope.html). +A simple wrapper around [`v8::HandleScope`](https://v8docs.nodesource.com/io.js-3.3/d3/d95/classv8_1_1_handle_scope.html). Definition: diff --git a/nodejs/node_modules/nan/doc/script.md b/nodejs/node_modules/nan/doc/script.md index 1267b5e7c..e518505ec 100644 --- a/nodejs/node_modules/nan/doc/script.md +++ b/nodejs/node_modules/nan/doc/script.md @@ -9,7 +9,7 @@ NAN provides a `v8::Script` helpers as the API has changed over the supported ve ### Nan::CompileScript() -A wrapper around [`v8::Script::Compile()`](https://v8docs.nodesource.com/io.js-3.0/da/da5/classv8_1_1_script_compiler.html#a93f5072a0db55d881b969e9fc98e564b). +A wrapper around [`v8::Script::Compile()`](https://v8docs.nodesource.com/io.js-3.3/da/da5/classv8_1_1_script_compiler.html#a93f5072a0db55d881b969e9fc98e564b). Note that `Nan::BoundScript` is an alias for `v8::Script`. diff --git a/nodejs/node_modules/nan/doc/v8_internals.md b/nodejs/node_modules/nan/doc/v8_internals.md index ce5f23081..430c4353f 100644 --- a/nodejs/node_modules/nan/doc/v8_internals.md +++ b/nodejs/node_modules/nan/doc/v8_internals.md @@ -33,7 +33,7 @@ NAN_GC_CALLBACK(gcPrologueCallback) { } NAN_METHOD(Hook) { - callback.Reset(args[0].As()); + callback.Reset(To(args[0]).ToLocalChecked()); Nan::AddGCPrologueCallback(gcPrologueCallback); info.GetReturnValue().Set(info.Holder()); } @@ -48,7 +48,7 @@ Signature: void Nan::AddGCEpilogueCallback(v8::Isolate::GCEpilogueCallback callback, v8::GCType gc_type_filter = v8::kGCTypeAll) ``` -Calls V8's [`AddGCEpilogueCallback()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a90d1860babc76059c62514b422f56960). +Calls V8's [`AddGCEpilogueCallback()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a90d1860babc76059c62514b422f56960). ### Nan::RemoveGCEpilogueCallback() @@ -59,7 +59,7 @@ Signature: void Nan::RemoveGCEpilogueCallback(v8::Isolate::GCEpilogueCallback callback) ``` -Calls V8's [`RemoveGCEpilogueCallback()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a05c60859fd4b8e96bfcd451281ed6c7c). +Calls V8's [`RemoveGCEpilogueCallback()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a05c60859fd4b8e96bfcd451281ed6c7c). ### Nan::AddGCPrologueCallback() @@ -70,7 +70,7 @@ Signature: void Nan::AddGCPrologueCallback(v8::Isolate::GCPrologueCallback, v8::GCType gc_type_filter callback) ``` -Calls V8's [`AddGCPrologueCallback()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#ab4b87b8f9f8e5bf95eba4009357e001f). +Calls V8's [`AddGCPrologueCallback()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#ab4b87b8f9f8e5bf95eba4009357e001f). ### Nan::RemoveGCPrologueCallback() @@ -81,7 +81,7 @@ Signature: void Nan::RemoveGCPrologueCallback(v8::Isolate::GCPrologueCallback callback) ``` -Calls V8's [`RemoveGCEpilogueCallback()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a9f6c51932811593f81ff30b949124186). +Calls V8's [`RemoveGCEpilogueCallback()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a9f6c51932811593f81ff30b949124186). ### Nan::GetHeapStatistics() @@ -92,7 +92,7 @@ Signature: void Nan::GetHeapStatistics(v8::HeapStatistics *heap_statistics) ``` -Calls V8's [`GetHeapStatistics()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a5593ac74687b713095c38987e5950b34). +Calls V8's [`GetHeapStatistics()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a5593ac74687b713095c38987e5950b34). ### Nan::SetCounterFunction() @@ -103,7 +103,7 @@ Signature: void Nan::SetCounterFunction(v8::CounterLookupCallback cb) ``` -Calls V8's [`SetCounterFunction()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a045d7754e62fa0ec72ae6c259b29af94). +Calls V8's [`SetCounterFunction()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a045d7754e62fa0ec72ae6c259b29af94). ### Nan::SetCreateHistogramFunction() @@ -114,7 +114,7 @@ Signature: void Nan::SetCreateHistogramFunction(v8::CreateHistogramCallback cb) ``` -Calls V8's [`SetCreateHistogramFunction()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a542d67e85089cb3f92aadf032f99e732). +Calls V8's [`SetCreateHistogramFunction()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a542d67e85089cb3f92aadf032f99e732). ### Nan::SetAddHistogramSampleFunction() @@ -125,7 +125,7 @@ Signature: void Nan::SetAddHistogramSampleFunction(v8::AddHistogramSampleCallback cb) ``` -Calls V8's [`SetAddHistogramSampleFunction()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#aeb420b690bc2c216882d6fdd00ddd3ea). +Calls V8's [`SetAddHistogramSampleFunction()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#aeb420b690bc2c216882d6fdd00ddd3ea). ### Nan::IdleNotification() @@ -136,7 +136,7 @@ Signature: void Nan::IdleNotification(v8::HeapStatistics *heap_statistics) ``` -Calls V8's [`IdleNotification()` or `IdleNotificationDeadline()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#ad6a2a02657f5425ad460060652a5a118) depending on V8 version. +Calls V8's [`IdleNotification()` or `IdleNotificationDeadline()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#ad6a2a02657f5425ad460060652a5a118) depending on V8 version. ### Nan::LowMemoryNotification() @@ -147,7 +147,7 @@ Signature: void Nan::LowMemoryNotification() ``` -Calls V8's [`LowMemoryNotification()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a24647f61d6b41f69668094bdcd6ea91f). +Calls V8's [`LowMemoryNotification()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a24647f61d6b41f69668094bdcd6ea91f). ### Nan::ContextDisposedNotification() @@ -158,7 +158,7 @@ Signature: void Nan::ContextDisposedNotification() ``` -Calls V8's [`ContextDisposedNotification()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#ad7f5dc559866343fe6cd8db1f134d48b). +Calls V8's [`ContextDisposedNotification()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#ad7f5dc559866343fe6cd8db1f134d48b). ### Nan::GetInternalFieldPointer() @@ -171,7 +171,7 @@ Signature: void* Nan::GetInternalFieldPointer(v8::Local object, int index) ``` -Calls the Object's [`GetAlignedPointerFromInternalField()` or `GetPointerFromInternalField()`](https://v8docs.nodesource.com/io.js-3.0/db/d85/classv8_1_1_object.html#ab3c57184263cf29963ef0017bec82281) depending on the version of V8. +Calls the Object's [`GetAlignedPointerFromInternalField()` or `GetPointerFromInternalField()`](https://v8docs.nodesource.com/io.js-3.3/db/d85/classv8_1_1_object.html#ab3c57184263cf29963ef0017bec82281) depending on the version of V8. ### Nan::SetInternalFieldPointer() @@ -184,7 +184,7 @@ Signature: void Nan::SetInternalFieldPointer(v8::Local object, int index, void* value) ``` -Calls the Object's [`SetAlignedPointerInInternalField()` or `SetPointerInInternalField()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#ad7f5dc559866343fe6cd8db1f134d48b) depending on the version of V8. +Calls the Object's [`SetAlignedPointerInInternalField()` or `SetPointerInInternalField()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#ad7f5dc559866343fe6cd8db1f134d48b) depending on the version of V8. ### Nan::AdjustExternalMemory() @@ -195,5 +195,5 @@ Signature: int Nan::AdjustExternalMemory(int bytesChange) ``` -Calls V8's [`AdjustAmountOfExternalAllocatedMemory()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#ae1a59cac60409d3922582c4af675473e). +Calls V8's [`AdjustAmountOfExternalAllocatedMemory()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#ae1a59cac60409d3922582c4af675473e). diff --git a/nodejs/node_modules/nan/doc/v8_misc.md b/nodejs/node_modules/nan/doc/v8_misc.md index 64f736d6d..8aa6653f2 100644 --- a/nodejs/node_modules/nan/doc/v8_misc.md +++ b/nodejs/node_modules/nan/doc/v8_misc.md @@ -12,7 +12,7 @@ Converts an object to a UTF-8-encoded character array. If conversion to a string fails (e.g. due to an exception in the toString() method of the object) then the length() method returns 0 and the * operator returns NULL. The underlying memory used for this object is managed by the object. -An implementation of [`v8::String::Utf8Value`](https://v8docs.nodesource.com/io.js-3.0/d4/d1b/classv8_1_1_string_1_1_utf8_value.html) that is consistent across all supported versions of V8. +An implementation of [`v8::String::Utf8Value`](https://v8docs.nodesource.com/io.js-3.3/d4/d1b/classv8_1_1_string_1_1_utf8_value.html) that is consistent across all supported versions of V8. Definition: @@ -31,7 +31,7 @@ class Nan::Utf8String { ### Nan::GetCurrentContext() -A call to [`v8::Isolate::GetCurrent()->GetCurrentContext()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a81c7a1ed7001ae2a65e89107f75fd053) that works across all supported versions of V8. +A call to [`v8::Isolate::GetCurrent()->GetCurrentContext()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a81c7a1ed7001ae2a65e89107f75fd053) that works across all supported versions of V8. Signature: @@ -42,7 +42,7 @@ v8::Local Nan::GetCurrentContext() ### Nan::SetIsolateData() -A helper to provide a consistent API to [`v8::Isolate#SetData()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#a7acadfe7965997e9c386a05f098fbe36). +A helper to provide a consistent API to [`v8::Isolate#SetData()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#a7acadfe7965997e9c386a05f098fbe36). Signature: @@ -54,7 +54,7 @@ void Nan::SetIsolateData(v8::Isolate *isolate, T *data) ### Nan::GetIsolateData() -A helper to provide a consistent API to [`v8::Isolate#GetData()`](https://v8docs.nodesource.com/io.js-3.0/d5/dda/classv8_1_1_isolate.html#aabd223436bc1100a787dadaa024c6257). +A helper to provide a consistent API to [`v8::Isolate#GetData()`](https://v8docs.nodesource.com/io.js-3.3/d5/dda/classv8_1_1_isolate.html#aabd223436bc1100a787dadaa024c6257). Signature: diff --git a/nodejs/node_modules/nan/nan.h b/nodejs/node_modules/nan/nan.h index 80a918ae7..7c7699ff8 100644 --- a/nodejs/node_modules/nan/nan.h +++ b/nodejs/node_modules/nan/nan.h @@ -13,7 +13,7 @@ * * MIT License * - * Version 2.6.2: current Node 7.9.0, Node 12: 0.12.18, Node 10: 0.10.48, iojs: 3.3.1 + * Version 2.8.0: current Node 9.2.0, Node 12: 0.12.18, Node 10: 0.10.48, iojs: 3.3.1 * * See https://github.com/nodejs/nan for the latest update to this file **********************************************************************************/ @@ -34,6 +34,8 @@ #define NODE_5_0_MODULE_VERSION 47 #define NODE_6_0_MODULE_VERSION 48 #define NODE_7_0_MODULE_VERSION 51 +#define NODE_8_0_MODULE_VERSION 57 +#define NODE_9_0_MODULE_VERSION 59 #ifdef _MSC_VER # define NAN_HAS_CPLUSPLUS_11 (_MSC_VER >= 1800) @@ -53,13 +55,16 @@ #include #include #include +#include #if defined(_MSC_VER) # pragma warning( push ) # pragma warning( disable : 4530 ) +# include # include # include # pragma warning( pop ) #else +# include # include # include #endif @@ -1606,20 +1611,90 @@ class Callback { char *errmsg_; }; - -template -/* abstract */ class AsyncProgressWorkerBase : public AsyncWorker { +/* abstract */ class AsyncBareProgressWorkerBase : public AsyncWorker { public: - explicit AsyncProgressWorkerBase(Callback *callback_) - : AsyncWorker(callback_), asyncdata_(NULL), asyncsize_(0) { - async = new uv_async_t; + explicit AsyncBareProgressWorkerBase(Callback *callback_) + : AsyncWorker(callback_) { uv_async_init( uv_default_loop() - , async + , &async , AsyncProgress_ ); - async->data = this; + async.data = this; + } + + virtual ~AsyncBareProgressWorkerBase() { + } + + virtual void WorkProgress() = 0; + + virtual void Destroy() { + uv_close(reinterpret_cast(&async), AsyncClose_); + } + + private: + inline static NAUV_WORK_CB(AsyncProgress_) { + AsyncBareProgressWorkerBase *worker = + static_cast(async->data); + worker->WorkProgress(); + } + + inline static void AsyncClose_(uv_handle_t* handle) { + AsyncBareProgressWorkerBase *worker = + static_cast(handle->data); + delete worker; + } + + protected: + uv_async_t async; +}; + +template +/* abstract */ +class AsyncBareProgressWorker : public AsyncBareProgressWorkerBase { + public: + explicit AsyncBareProgressWorker(Callback *callback_) + : AsyncBareProgressWorkerBase(callback_) { + } + virtual ~AsyncBareProgressWorker() { + } + + class ExecutionProgress { + friend class AsyncBareProgressWorker; + public: + void Signal() const { + uv_async_send(&that_->async); + } + + void Send(const T* data, size_t count) const { + that_->SendProgress_(data, count); + } + + private: + explicit ExecutionProgress(AsyncBareProgressWorker *that) : that_(that) {} + NAN_DISALLOW_ASSIGN_COPY_MOVE(ExecutionProgress) + AsyncBareProgressWorker* const that_; + }; + + virtual void Execute(const ExecutionProgress& progress) = 0; + virtual void HandleProgressCallback(const T *data, size_t size) = 0; + + private: + void Execute() /*final override*/ { + ExecutionProgress progress(this); + Execute(progress); + } + + virtual void SendProgress_(const T *data, size_t count) = 0; +}; + +template +/* abstract */ +class AsyncProgressWorkerBase : public AsyncBareProgressWorker { + public: + explicit AsyncProgressWorkerBase(Callback *callback_) + : AsyncBareProgressWorker(callback_), asyncdata_(NULL), asyncsize_(0) { uv_mutex_init(&async_lock); } @@ -1637,82 +1712,150 @@ template uv_mutex_unlock(&async_lock); // Don't send progress events after we've already completed. - if (callback) { - HandleProgressCallback(data, size); + if (this->callback) { + this->HandleProgressCallback(data, size); } delete[] data; } - class ExecutionProgress { - friend class AsyncProgressWorkerBase; - public: - void Signal() const { - uv_async_send(that_->async); + private: + void SendProgress_(const T *data, size_t count) { + T *new_data = new T[count]; + { + T *it = new_data; + std::copy(data, data + count, it); } - void Send(const T* data, size_t size) const { - that_->SendProgress_(data, size); + uv_mutex_lock(&async_lock); + T *old_data = asyncdata_; + asyncdata_ = new_data; + asyncsize_ = count; + uv_mutex_unlock(&async_lock); + + delete[] old_data; + uv_async_send(&this->async); + } + + uv_mutex_t async_lock; + T *asyncdata_; + size_t asyncsize_; +}; + +// This ensures compatibility to the previous un-templated AsyncProgressWorker +// class definition. +typedef AsyncProgressWorkerBase AsyncProgressWorker; + +template +/* abstract */ +class AsyncBareProgressQueueWorker : public AsyncBareProgressWorkerBase { + public: + explicit AsyncBareProgressQueueWorker(Callback *callback_) + : AsyncBareProgressWorkerBase(callback_) { + } + + virtual ~AsyncBareProgressQueueWorker() { + } + + class ExecutionProgress { + friend class AsyncBareProgressQueueWorker; + public: + void Send(const T* data, size_t count) const { + that_->SendProgress_(data, count); } private: - explicit ExecutionProgress(AsyncProgressWorkerBase *that) : that_(that) {} + explicit ExecutionProgress(AsyncBareProgressQueueWorker *that) + : that_(that) {} NAN_DISALLOW_ASSIGN_COPY_MOVE(ExecutionProgress) - AsyncProgressWorkerBase* const that_; + AsyncBareProgressQueueWorker* const that_; }; virtual void Execute(const ExecutionProgress& progress) = 0; virtual void HandleProgressCallback(const T *data, size_t size) = 0; - virtual void Destroy() { - uv_close(reinterpret_cast(async), AsyncClose_); - } - private: void Execute() /*final override*/ { - ExecutionProgress progress(this); - Execute(progress); + ExecutionProgress progress(this); + Execute(progress); } - void SendProgress_(const T *data, size_t size) { - T *new_data = new T[size]; - { - T *it = new_data; - std::copy(data, data + size, it); - } + virtual void SendProgress_(const T *data, size_t count) = 0; +}; +template +/* abstract */ +class AsyncProgressQueueWorker : public AsyncBareProgressQueueWorker { + public: + explicit AsyncProgressQueueWorker(Callback *callback_) + : AsyncBareProgressQueueWorker(callback_) { + uv_mutex_init(&async_lock); + } + + virtual ~AsyncProgressQueueWorker() { uv_mutex_lock(&async_lock); - T *old_data = asyncdata_; - asyncdata_ = new_data; - asyncsize_ = size; + + while (!asyncdata_.empty()) { + std::pair &datapair = asyncdata_.front(); + T *data = datapair.first; + + asyncdata_.pop(); + + delete[] data; + } + uv_mutex_unlock(&async_lock); + uv_mutex_destroy(&async_lock); + } - delete[] old_data; - uv_async_send(async); + void WorkComplete() { + WorkProgress(); + AsyncWorker::WorkComplete(); } - inline static NAUV_WORK_CB(AsyncProgress_) { - AsyncProgressWorkerBase *worker = - static_cast(async->data); - worker->WorkProgress(); + void WorkProgress() { + uv_mutex_lock(&async_lock); + + while (!asyncdata_.empty()) { + std::pair &datapair = asyncdata_.front(); + + T *data = datapair.first; + size_t size = datapair.second; + + asyncdata_.pop(); + uv_mutex_unlock(&async_lock); + + // Don't send progress events after we've already completed. + if (this->callback) { + this->HandleProgressCallback(data, size); + } + + delete[] data; + + uv_mutex_lock(&async_lock); + } + + uv_mutex_unlock(&async_lock); } - inline static void AsyncClose_(uv_handle_t* handle) { - AsyncProgressWorkerBase *worker = - static_cast(handle->data); - delete reinterpret_cast(handle); - delete worker; + private: + void SendProgress_(const T *data, size_t count) { + T *new_data = new T[count]; + { + T *it = new_data; + std::copy(data, data + count, it); + } + + uv_mutex_lock(&async_lock); + asyncdata_.push(std::pair(new_data, count)); + uv_mutex_unlock(&async_lock); + + uv_async_send(&this->async); } - uv_async_t *async; uv_mutex_t async_lock; - T *asyncdata_; - size_t asyncsize_; + std::queue > asyncdata_; }; -// This ensures compatibility to the previous un-templated AsyncProgressWorker -// class definition. -typedef AsyncProgressWorkerBase AsyncProgressWorker; - inline void AsyncExecute (uv_work_t* req) { AsyncWorker *worker = static_cast(req->data); worker->Execute(); diff --git a/nodejs/node_modules/nan/nan_converters.h b/nodejs/node_modules/nan/nan_converters.h index 9dbd1eca3..8a569b5e4 100644 --- a/nodejs/node_modules/nan/nan_converters.h +++ b/nodejs/node_modules/nan/nan_converters.h @@ -17,6 +17,14 @@ template struct ValueFactoryBase { typedef Maybe return_t; }; template struct ToFactory; +template<> +struct ToFactory : ToFactoryBase { + static inline return_t convert(v8::Local val) { + if (val.IsEmpty() || !val->IsFunction()) return MaybeLocal(); + return MaybeLocal(val.As()); + } +}; + #define X(TYPE) \ template<> \ struct ToFactory : ToFactoryBase { \ diff --git a/nodejs/node_modules/nan/nan_json.h b/nodejs/node_modules/nan/nan_json.h index 465614b81..1b1b38f1b 100644 --- a/nodejs/node_modules/nan/nan_json.h +++ b/nodejs/node_modules/nan/nan_json.h @@ -78,7 +78,8 @@ class JSON { return scope.Escape(parse(json_string)); #else Nan::MaybeLocal result; -#if NODE_MODULE_VERSION == NODE_0_12_MODULE_VERSION +#if NODE_MODULE_VERSION >= NODE_0_12_MODULE_VERSION && \ + NODE_MODULE_VERSION <= IOJS_2_0_MODULE_VERSION result = v8::JSON::Parse(json_string); #else #if NODE_MODULE_VERSION > NODE_6_0_MODULE_VERSION @@ -87,7 +88,8 @@ class JSON { v8::Isolate* context_or_isolate = v8::Isolate::GetCurrent(); #endif // NODE_MODULE_VERSION > NODE_6_0_MODULE_VERSION result = v8::JSON::Parse(context_or_isolate, json_string); -#endif // NODE_MODULE_VERSION == NODE_0_12_MODULE_VERSION +#endif // NODE_MODULE_VERSION >= NODE_0_12_MODULE_VERSION && + // NODE_MODULE_VERSION <= IOJS_2_0_MODULE_VERSION if (result.IsEmpty()) return v8::Local(); return scope.Escape(result.ToLocalChecked()); #endif // NAN_JSON_H_NEED_PARSE diff --git a/nodejs/node_modules/nan/nan_maybe_43_inl.h b/nodejs/node_modules/nan/nan_maybe_43_inl.h index 10eeb0235..5bfac7277 100644 --- a/nodejs/node_modules/nan/nan_maybe_43_inl.h +++ b/nodejs/node_modules/nan/nan_maybe_43_inl.h @@ -102,14 +102,32 @@ inline Maybe Set( return obj->Set(isolate->GetCurrentContext(), index, value); } -inline Maybe ForceSet( +inline Maybe DefineOwnProperty( + v8::Local obj + , v8::Local key + , v8::Local value + , v8::PropertyAttribute attribs = v8::None) { + v8::Isolate *isolate = v8::Isolate::GetCurrent(); + v8::HandleScope scope(isolate); + return obj->DefineOwnProperty(isolate->GetCurrentContext(), key, value, + attribs); +} + +NAN_DEPRECATED inline Maybe ForceSet( v8::Local obj , v8::Local key , v8::Local value , v8::PropertyAttribute attribs = v8::None) { v8::Isolate *isolate = v8::Isolate::GetCurrent(); v8::HandleScope scope(isolate); +#if NODE_MODULE_VERSION >= NODE_9_0_MODULE_VERSION + return key->IsName() + ? obj->DefineOwnProperty(isolate->GetCurrentContext(), + key.As(), value, attribs) + : Nothing(); +#else return obj->ForceSet(isolate->GetCurrentContext(), key, value, attribs); +#endif } inline MaybeLocal Get( diff --git a/nodejs/node_modules/nan/nan_maybe_pre_43_inl.h b/nodejs/node_modules/nan/nan_maybe_pre_43_inl.h index d47181e74..8100125fd 100644 --- a/nodejs/node_modules/nan/nan_maybe_pre_43_inl.h +++ b/nodejs/node_modules/nan/nan_maybe_pre_43_inl.h @@ -41,7 +41,7 @@ class MaybeLocal { template inline v8::Local FromMaybe(v8::Local default_value) const { - return IsEmpty() ? default_value : val_; + return IsEmpty() ? default_value : v8::Local(val_); } private: @@ -148,7 +148,20 @@ inline Maybe Set( return Just(obj->Set(index, value)); } -inline Maybe ForceSet( +inline Maybe DefineOwnProperty( + v8::Handle obj + , v8::Handle key + , v8::Handle value + , v8::PropertyAttribute attribs = v8::None) { + v8::PropertyAttribute current = obj->GetPropertyAttributes(key); + return !(current & v8::DontDelete) || // configurable OR + !(current & v8::ReadOnly) && // writable AND + !((attribs ^ current) & ~v8::ReadOnly) // same excluding RO + ? Just(obj->ForceSet(key, value, attribs)) + : Nothing(); +} + +NAN_DEPRECATED inline Maybe ForceSet( v8::Handle obj , v8::Handle key , v8::Handle value diff --git a/nodejs/node_modules/nan/package.json b/nodejs/node_modules/nan/package.json index 91b714b22..a02307f74 100644 --- a/nodejs/node_modules/nan/package.json +++ b/nodejs/node_modules/nan/package.json @@ -1,51 +1,33 @@ { "_args": [ [ - { - "raw": "nan@^2.3.5", - "scope": null, - "escapedName": "nan", - "name": "nan", - "rawSpec": "^2.3.5", - "spec": ">=2.3.5 <3.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/lame" + "nan@2.8.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "nan@>=2.3.5 <3.0.0", - "_id": "nan@2.6.2", - "_inCache": true, + "_from": "nan@2.8.0", + "_id": "nan@2.8.0", + "_inBundle": false, + "_integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=", "_location": "/nan", - "_nodeVersion": "7.5.0", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/nan-2.6.2.tgz_1492029516320_0.2352329883724451" - }, - "_npmUser": { - "name": "kkoopa", - "email": "bbyholm@abo.fi" - }, - "_npmVersion": "4.1.2", "_phantomChildren": {}, "_requested": { - "raw": "nan@^2.3.5", - "scope": null, - "escapedName": "nan", + "type": "version", + "registry": true, + "raw": "nan@2.8.0", "name": "nan", - "rawSpec": "^2.3.5", - "spec": ">=2.3.5 <3.0.0", - "type": "range" + "escapedName": "nan", + "rawSpec": "2.8.0", + "saveSpec": null, + "fetchSpec": "2.8.0" }, "_requiredBy": [ "/lame", "/osx-audio" ], - "_resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", - "_shasum": "e4ff34e6c95fdfb5aecc08de6596f43605a7db45", - "_shrinkwrap": null, - "_spec": "nan@^2.3.5", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/lame", + "_resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "_spec": "2.8.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/nodejs/nan/issues" }, @@ -91,47 +73,29 @@ "url": "https://github.com/mkrufky" } ], - "dependencies": {}, - "description": "Native Abstractions for Node.js: C++ header for Node 0.8 -> 7 compatibility", + "description": "Native Abstractions for Node.js: C++ header for Node 0.8 -> 9 compatibility", "devDependencies": { "bindings": "~1.2.1", "commander": "^2.8.1", "glob": "^5.0.14", - "node-gyp": "~3.0.1", + "node-gyp": "~3.6.2", "readable-stream": "^2.1.4", + "request": "=2.81.0", "tap": "~0.7.1", "xtend": "~4.0.0" }, - "directories": {}, - "dist": { - "shasum": "e4ff34e6c95fdfb5aecc08de6596f43605a7db45", - "tarball": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz" - }, - "gitHead": "f0b2f64c1e5317888f2e12fdefb2f105e7018552", "homepage": "https://github.com/nodejs/nan#readme", "license": "MIT", "main": "include_dirs.js", - "maintainers": [ - { - "name": "rvagg", - "email": "rod@vagg.org" - }, - { - "name": "kkoopa", - "email": "bbyholm@abo.fi" - } - ], "name": "nan", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/nodejs/nan.git" }, "scripts": { "docs": "doc/.build.sh", - "rebuild-tests": "node-gyp rebuild --msvs_version=2013 --directory test", + "rebuild-tests": "node-gyp rebuild --msvs_version=2015 --directory test", "test": "tap --gc --stderr test/js/*-test.js" }, - "version": "2.6.2" + "version": "2.8.0" } diff --git a/nodejs/node_modules/negotiator/package.json b/nodejs/node_modules/negotiator/package.json index c4497e4dd..849fde3e6 100644 --- a/nodejs/node_modules/negotiator/package.json +++ b/nodejs/node_modules/negotiator/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "negotiator@0.6.1", - "scope": null, - "escapedName": "negotiator", - "name": "negotiator", - "rawSpec": "0.6.1", - "spec": "0.6.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/accepts" + "negotiator@0.6.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "negotiator@0.6.1", "_id": "negotiator@0.6.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "_location": "/negotiator", - "_nodeVersion": "4.4.3", - "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/negotiator-0.6.1.tgz_1462250848695_0.027451182017102838" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.1", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "negotiator@0.6.1", - "scope": null, - "escapedName": "negotiator", "name": "negotiator", + "escapedName": "negotiator", "rawSpec": "0.6.1", - "spec": "0.6.1", - "type": "version" + "saveSpec": null, + "fetchSpec": "0.6.1" }, "_requiredBy": [ "/accepts" ], "_resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "_shasum": "2b327184e8992101177b28563fb5e7102acd0ca9", - "_shrinkwrap": null, - "_spec": "negotiator@0.6.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/accepts", + "_spec": "0.6.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/negotiator/issues" }, @@ -63,17 +45,11 @@ "url": "http://blog.izs.me/" } ], - "dependencies": {}, "description": "HTTP content negotiation", "devDependencies": { "istanbul": "0.4.3", "mocha": "~1.21.5" }, - "directories": {}, - "dist": { - "shasum": "2b327184e8992101177b28563fb5e7102acd0ca9", - "tarball": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -84,7 +60,6 @@ "index.js", "README.md" ], - "gitHead": "751c381c32707f238143cd65d78520e16f4ef9e5", "homepage": "https://github.com/jshttp/negotiator#readme", "keywords": [ "http", @@ -95,23 +70,7 @@ "accept-charset" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "federomero", - "email": "federomero@gmail.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - } - ], "name": "negotiator", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/negotiator.git" diff --git a/nodejs/node_modules/on-finished/package.json b/nodejs/node_modules/on-finished/package.json index 173886c7b..2ade1098e 100644 --- a/nodejs/node_modules/on-finished/package.json +++ b/nodejs/node_modules/on-finished/package.json @@ -1,47 +1,35 @@ { "_args": [ [ - { - "raw": "on-finished@~2.3.0", - "scope": null, - "escapedName": "on-finished", - "name": "on-finished", - "rawSpec": "~2.3.0", - "spec": ">=2.3.0 <2.4.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "on-finished@2.3.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "on-finished@>=2.3.0 <2.4.0", + "_from": "on-finished@2.3.0", "_id": "on-finished@2.3.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", "_location": "/on-finished", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "on-finished@~2.3.0", - "scope": null, - "escapedName": "on-finished", + "type": "version", + "registry": true, + "raw": "on-finished@2.3.0", "name": "on-finished", - "rawSpec": "~2.3.0", - "spec": ">=2.3.0 <2.4.0", - "type": "range" + "escapedName": "on-finished", + "rawSpec": "2.3.0", + "saveSpec": null, + "fetchSpec": "2.3.0" }, "_requiredBy": [ + "/body-parser", "/express", "/finalhandler", "/send" ], "_resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "_shasum": "20f1336481b083cd75337992a16971aa2d906947", - "_shrinkwrap": null, - "_spec": "on-finished@~2.3.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "2.3.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/on-finished/issues" }, @@ -64,11 +52,6 @@ "istanbul": "0.3.9", "mocha": "2.2.5" }, - "directories": {}, - "dist": { - "shasum": "20f1336481b083cd75337992a16971aa2d906947", - "tarball": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" - }, "engines": { "node": ">= 0.8" }, @@ -77,22 +60,9 @@ "LICENSE", "index.js" ], - "gitHead": "34babcb58126a416fcf5205768204f2e12699dda", - "homepage": "https://github.com/jshttp/on-finished", + "homepage": "https://github.com/jshttp/on-finished#readme", "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - } - ], "name": "on-finished", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/on-finished.git" diff --git a/nodejs/node_modules/osx-audio/build/Makefile b/nodejs/node_modules/osx-audio/build/Makefile index 109107276..1501e556a 100644 --- a/nodejs/node_modules/osx-audio/build/Makefile +++ b/nodejs/node_modules/osx-audio/build/Makefile @@ -326,8 +326,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\ endif quiet_cmd_regen_makefile = ACTION Regenerating $@ -cmd_regen_makefile = cd $(srcdir); /Users/muammar/github/mkchromecast/nodejs/node-7.10.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/muammar/github/mkchromecast/nodejs/node_modules/osx-audio/build/config.gypi -I/Users/muammar/github/mkchromecast/nodejs/node-7.10.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/muammar/.node-gyp/7.10.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/muammar/.node-gyp/7.10.0" "-Dnode_gyp_dir=/Users/muammar/github/mkchromecast/nodejs/node-7.10.0/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/Users/muammar/github/mkchromecast/nodejs/node_modules/osx-audio" binding.gyp -Makefile: $(srcdir)/../../node-7.10.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/../../../../../.node-gyp/7.10.0/include/node/common.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp +cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/muammar/github/mkchromecast/nodejs/node_modules/osx-audio/build/config.gypi -I/usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/muammar/.node-gyp/9.3.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/muammar/.node-gyp/9.3.0" "-Dnode_gyp_dir=/usr/local/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/Users/muammar/.node-gyp/9.3.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/muammar/github/mkchromecast/nodejs/node_modules/osx-audio" "-Dnode_engine=v8" binding.gyp +Makefile: $(srcdir)/../../../../../.node-gyp/9.3.0/include/node/common.gypi $(srcdir)/../../../../../../../usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(call do_cmd,regen_makefile) # "all" is a concatenation of the "all" targets from all the included diff --git a/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/AudioInput.o.d b/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/AudioInput.o.d index 928071548..e303c1dba 100644 --- a/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/AudioInput.o.d +++ b/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/AudioInput.o.d @@ -1,20 +1,21 @@ -cmd_Release/obj.target/audio/src/AudioInput.o := c++ '-DNODE_GYP_MODULE_NAME=audio' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../src -I../System/Library/Frameworks/CoreFoundation.framework/Headers -I../System/Library/Frameworks/AudioToolbox.framework/Headers -I../System/Library/Frameworks/CoreAudio.framework/Headers -I../../nan -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/audio/src/AudioInput.o.d.raw -c -o Release/obj.target/audio/src/AudioInput.o ../src/AudioInput.cc +cmd_Release/obj.target/audio/src/AudioInput.o := c++ '-DNODE_GYP_MODULE_NAME=audio' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../src -I../System/Library/Frameworks/CoreFoundation.framework/Headers -I../System/Library/Frameworks/AudioToolbox.framework/Headers -I../System/Library/Frameworks/CoreAudio.framework/Headers -I../../nan -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/audio/src/AudioInput.o.d.raw -c -o Release/obj.target/audio/src/AudioInput.o ../src/AudioInput.cc Release/obj.target/audio/src/AudioInput.o: ../src/AudioInput.cc \ ../src/AudioInput.h ../../nan/nan.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8config.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8config.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h \ ../../nan/nan_callbacks.h ../../nan/nan_callbacks_12_inl.h \ ../../nan/nan_maybe_43_inl.h ../../nan/nan_converters.h \ ../../nan/nan_converters_43_inl.h ../../nan/nan_new.h \ @@ -26,20 +27,21 @@ Release/obj.target/audio/src/AudioInput.o: ../src/AudioInput.cc \ ../src/AudioInput.cc: ../src/AudioInput.h: ../../nan/nan.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h: -/Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8config.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h: +/Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8config.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h: ../../nan/nan_callbacks.h: ../../nan/nan_callbacks_12_inl.h: ../../nan/nan_maybe_43_inl.h: diff --git a/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/bindings.o.d b/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/bindings.o.d index 452de1f71..37f3d5712 100644 --- a/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/bindings.o.d +++ b/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/bindings.o.d @@ -1,20 +1,21 @@ -cmd_Release/obj.target/audio/src/bindings.o := c++ '-DNODE_GYP_MODULE_NAME=audio' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../src -I../System/Library/Frameworks/CoreFoundation.framework/Headers -I../System/Library/Frameworks/AudioToolbox.framework/Headers -I../System/Library/Frameworks/CoreAudio.framework/Headers -I../../nan -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/audio/src/bindings.o.d.raw -c -o Release/obj.target/audio/src/bindings.o ../src/bindings.cc +cmd_Release/obj.target/audio/src/bindings.o := c++ '-DNODE_GYP_MODULE_NAME=audio' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../src -I../System/Library/Frameworks/CoreFoundation.framework/Headers -I../System/Library/Frameworks/AudioToolbox.framework/Headers -I../System/Library/Frameworks/CoreAudio.framework/Headers -I../../nan -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/audio/src/bindings.o.d.raw -c -o Release/obj.target/audio/src/bindings.o ../src/bindings.cc Release/obj.target/audio/src/bindings.o: ../src/bindings.cc \ ../../nan/nan.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/v8config.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h \ - /Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8config.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h \ + /Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h \ ../../nan/nan_callbacks.h ../../nan/nan_callbacks_12_inl.h \ ../../nan/nan_maybe_43_inl.h ../../nan/nan_converters.h \ ../../nan/nan_converters_43_inl.h ../../nan/nan_new.h \ @@ -25,20 +26,21 @@ Release/obj.target/audio/src/bindings.o: ../src/bindings.cc \ ../src/AudioInput.h ../src/lib/OSXAudioInput.h ../src/bindings.cc: ../../nan/nan.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-errno.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-unix.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-threadpool.h: -/Users/muammar/.node-gyp/7.10.0/include/node/uv-darwin.h: -/Users/muammar/.node-gyp/7.10.0/include/node/pthread-barrier.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8-version.h: -/Users/muammar/.node-gyp/7.10.0/include/node/v8config.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_buffer.h: -/Users/muammar/.node-gyp/7.10.0/include/node/node_object_wrap.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-errno.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-unix.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-threadpool.h: +/Users/muammar/.node-gyp/9.3.0/include/node/uv-darwin.h: +/Users/muammar/.node-gyp/9.3.0/include/node/pthread-barrier.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-version.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8config.h: +/Users/muammar/.node-gyp/9.3.0/include/node/v8-platform.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_buffer.h: +/Users/muammar/.node-gyp/9.3.0/include/node/node_object_wrap.h: ../../nan/nan_callbacks.h: ../../nan/nan_callbacks_12_inl.h: ../../nan/nan_maybe_43_inl.h: diff --git a/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/lib/OSXAudioInput.o.d b/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/lib/OSXAudioInput.o.d index 30d980a74..9a442e6e9 100644 --- a/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/lib/OSXAudioInput.o.d +++ b/nodejs/node_modules/osx-audio/build/Release/.deps/Release/obj.target/audio/src/lib/OSXAudioInput.o.d @@ -1,4 +1,4 @@ -cmd_Release/obj.target/audio/src/lib/OSXAudioInput.o := c++ '-DNODE_GYP_MODULE_NAME=audio' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/7.10.0/include/node -I/Users/muammar/.node-gyp/7.10.0/src -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include -I../src -I../System/Library/Frameworks/CoreFoundation.framework/Headers -I../System/Library/Frameworks/AudioToolbox.framework/Headers -I../System/Library/Frameworks/CoreAudio.framework/Headers -I../../nan -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/audio/src/lib/OSXAudioInput.o.d.raw -c -o Release/obj.target/audio/src/lib/OSXAudioInput.o ../src/lib/OSXAudioInput.cc +cmd_Release/obj.target/audio/src/lib/OSXAudioInput.o := c++ '-DNODE_GYP_MODULE_NAME=audio' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/muammar/.node-gyp/9.3.0/include/node -I/Users/muammar/.node-gyp/9.3.0/src -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include -I../src -I../System/Library/Frameworks/CoreFoundation.framework/Headers -I../System/Library/Frameworks/AudioToolbox.framework/Headers -I../System/Library/Frameworks/CoreAudio.framework/Headers -I../../nan -Os -gdwarf-2 -mmacosx-version-min=10.7 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++0x -stdlib=libc++ -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/audio/src/lib/OSXAudioInput.o.d.raw -c -o Release/obj.target/audio/src/lib/OSXAudioInput.o ../src/lib/OSXAudioInput.cc Release/obj.target/audio/src/lib/OSXAudioInput.o: \ ../src/lib/OSXAudioInput.cc ../src/lib/OSXAudioInput.h ../src/lib/OSXAudioInput.cc: diff --git a/nodejs/node_modules/osx-audio/build/Release/audio.node b/nodejs/node_modules/osx-audio/build/Release/audio.node index 26d7e7165..34632c42a 100755 Binary files a/nodejs/node_modules/osx-audio/build/Release/audio.node and b/nodejs/node_modules/osx-audio/build/Release/audio.node differ diff --git a/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/AudioInput.o b/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/AudioInput.o index d2b5322fd..6762ef90f 100644 Binary files a/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/AudioInput.o and b/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/AudioInput.o differ diff --git a/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/bindings.o b/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/bindings.o index 681bbb9fe..f2cf2d417 100644 Binary files a/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/bindings.o and b/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/bindings.o differ diff --git a/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/lib/OSXAudioInput.o b/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/lib/OSXAudioInput.o index 48406d5b4..c1e584473 100644 Binary files a/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/lib/OSXAudioInput.o and b/nodejs/node_modules/osx-audio/build/Release/obj.target/audio/src/lib/OSXAudioInput.o differ diff --git a/nodejs/node_modules/osx-audio/build/audio.target.mk b/nodejs/node_modules/osx-audio/build/audio.target.mk index 1e441dceb..569743023 100644 --- a/nodejs/node_modules/osx-audio/build/audio.target.mk +++ b/nodejs/node_modules/osx-audio/build/audio.target.mk @@ -12,7 +12,8 @@ DEFS_Debug := \ '-D_FILE_OFFSET_BITS=64' \ '-DBUILDING_NODE_EXTENSION' \ '-DDEBUG' \ - '-D_DEBUG' + '-D_DEBUG' \ + '-DV8_ENABLE_CHECKS' # Flags passed to all source files. CFLAGS_Debug := \ @@ -45,10 +46,10 @@ CFLAGS_OBJC_Debug := CFLAGS_OBJCC_Debug := INCS_Debug := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/src \ -I$(srcdir)/System/Library/Frameworks/CoreFoundation.framework/Headers \ -I$(srcdir)/System/Library/Frameworks/AudioToolbox.framework/Headers \ @@ -96,10 +97,10 @@ CFLAGS_OBJC_Release := CFLAGS_OBJCC_Release := INCS_Release := \ - -I/Users/muammar/.node-gyp/7.10.0/include/node \ - -I/Users/muammar/.node-gyp/7.10.0/src \ - -I/Users/muammar/.node-gyp/7.10.0/deps/uv/include \ - -I/Users/muammar/.node-gyp/7.10.0/deps/v8/include \ + -I/Users/muammar/.node-gyp/9.3.0/include/node \ + -I/Users/muammar/.node-gyp/9.3.0/src \ + -I/Users/muammar/.node-gyp/9.3.0/deps/uv/include \ + -I/Users/muammar/.node-gyp/9.3.0/deps/v8/include \ -I$(srcdir)/src \ -I$(srcdir)/System/Library/Frameworks/CoreFoundation.framework/Headers \ -I$(srcdir)/System/Library/Frameworks/AudioToolbox.framework/Headers \ diff --git a/nodejs/node_modules/osx-audio/build/config.gypi b/nodejs/node_modules/osx-audio/build/config.gypi index 0e7d2a709..3078e03d2 100644 --- a/nodejs/node_modules/osx-audio/build/config.gypi +++ b/nodejs/node_modules/osx-audio/build/config.gypi @@ -11,6 +11,8 @@ "asan": 0, "coverage": "false", "debug_devtools": "node", + "debug_http2": "false", + "debug_nghttp2": "false", "force_dynamic_crt": 0, "host_arch": "x64", "icu_gyp_path": "tools/icu/icu-system.gyp", @@ -20,14 +22,15 @@ "node_enable_d8": "false", "node_enable_v8_vtunejit": "false", "node_install_npm": "false", - "node_module_version": 51, + "node_module_version": 59, "node_no_browser_globals": "false", - "node_prefix": "/usr/local/Cellar/node/7.10.0", + "node_prefix": "/usr/local/Cellar/node/9.3.0_1", "node_release_urlbase": "", "node_shared": "false", "node_shared_cares": "false", "node_shared_http_parser": "false", "node_shared_libuv": "false", + "node_shared_nghttp2": "false", "node_shared_openssl": "false", "node_shared_zlib": "false", "node_tag": "", @@ -38,35 +41,37 @@ "node_use_openssl": "true", "node_use_perfctr": "false", "node_use_v8_platform": "true", + "node_without_node_options": "false", "openssl_fips": "", "openssl_no_asm": 0, - "shlib_suffix": "51.dylib", + "shlib_suffix": "59.dylib", "target_arch": "x64", "uv_parent_path": "/deps/uv/", "uv_use_dtrace": "true", "v8_enable_gdbjit": 0, "v8_enable_i18n_support": 1, - "v8_inspector": "true", + "v8_enable_inspector": 1, "v8_no_strict_aliasing": 1, "v8_optimized_debug": 0, + "v8_promise_internal_field_count": 1, "v8_random_seed": 0, + "v8_trace_maps": 0, "v8_use_snapshot": "true", "want_separate_host_toolset": 0, - "want_separate_host_toolset_mkpeephole": 0, - "xcode_version": "8.1", - "nodedir": "/Users/muammar/.node-gyp/7.10.0", - "copy_dev_lib": "true", + "xcode_version": "9.0", + "nodedir": "/Users/muammar/.node-gyp/9.3.0", "standalone_static_library": 1, "dry_run": "", "legacy_bundling": "", "save_dev": "", "browser": "", + "commit_hooks": "true", "only": "", "viewer": "man", "also": "", "rollback": "true", "usage": "", - "globalignorefile": "/usr/local/Cellar/node/7.10.0/etc/npmignore", + "globalignorefile": "/usr/local/etc/npmignore", "init_author_url": "", "maxsockets": "50", "shell": "/bin/zsh", @@ -74,6 +79,7 @@ "parseable": "", "shrinkwrap": "true", "init_license": "ISC", + "timing": "", "if_present": "", "cache_max": "Infinity", "init_author_email": "", @@ -87,41 +93,53 @@ "key": "", "message": "%s", "versions": "", - "globalconfig": "/usr/local/Cellar/node/7.10.0/etc/npmrc", + "globalconfig": "/usr/local/etc/npmrc", "always_auth": "", "logs_max": "10", + "prefer_online": "", "cache_lock_retries": "10", "global_style": "", "heading": "npm", "fetch_retry_mintimeout": "10000", - "proprietary_attribs": "true", + "offline": "", + "read_only": "", "searchlimit": "20", "access": "", "json": "", + "allow_same_version": "", "description": "true", "engine_strict": "", "https_proxy": "", "init_module": "/Users/muammar/.npm-init.js", "userconfig": "/Users/muammar/.npmrc", - "node_version": "7.10.0", - "user": "1000", + "cidr": "", + "node_version": "9.3.0", + "user": "", + "auth_type": "legacy", "editor": "vi", - "save": "", + "ignore_prepublish": "", + "save": "true", + "script_shell": "", "tag": "latest", "global": "", "progress": "true", + "ham_it_up": "", "optional": "true", "searchstaleness": "900", "bin_links": "true", "force": "", + "save_prod": "", "searchopts": "", "depth": "Infinity", + "node_gyp": "/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js", "rebuild_bundle": "true", + "sso_poll_frequency": "500", "unicode": "true", "fetch_retry_maxtimeout": "60000", "ca": "", "save_prefix": "^", "scripts_prepend_node_path": "warn-only", + "sso_type": "oauth", "strict_ssl": "true", "tag_version_prefix": "v", "dev": "", @@ -129,19 +147,24 @@ "group": "20", "save_exact": "", "cache_lock_stale": "60000", + "prefer_offline": "", "version": "", "cache_min": "10", + "otp": "", "cache": "/Users/muammar/.npm", "searchexclude": "", "color": "true", + "package_lock": "true", + "package_lock_only": "", "save_optional": "", - "user_agent": "npm/4.2.0 node/v7.10.0 darwin x64", + "user_agent": "npm/5.6.0 node/v9.3.0 darwin x64", "ignore_scripts": "", "cache_lock_wait": "10000", "production": "", "save_bundle": "", "send_metrics": "", "init_version": "1.0.0", + "node_options": "", "umask": "0022", "scope": "", "git": "git", @@ -149,7 +172,7 @@ "onload_script": "", "tmp": "/var/folders/st/bkg3wlq1339gymvv4fq20ll40000z8/T", "unsafe_perm": "true", - "link": "", - "prefix": "/usr/local/Cellar/node/7.10.0" + "prefix": "/usr/local", + "link": "" } } diff --git a/nodejs/node_modules/osx-audio/package.json b/nodejs/node_modules/osx-audio/package.json index eda7350f6..2aef5cc18 100644 --- a/nodejs/node_modules/osx-audio/package.json +++ b/nodejs/node_modules/osx-audio/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "osx-audio@^1.0.0", - "scope": null, - "escapedName": "osx-audio", - "name": "osx-audio", - "rawSpec": "^1.0.0", - "spec": ">=1.0.0 <2.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio" + "osx-audio@1.0.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "osx-audio@>=1.0.0 <2.0.0", + "_from": "osx-audio@1.0.0", "_id": "osx-audio@1.0.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-FGnbQrT/mv6jc9egxWpNfZ0E7z8=", "_location": "/osx-audio", - "_nodeVersion": "4.2.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/osx-audio-1.0.0.tgz_1463256106876_0.2333776804152876" - }, - "_npmUser": { - "name": "fardog", - "email": "code@fardogllc.com" - }, - "_npmVersion": "2.14.7", "_phantomChildren": {}, "_requested": { - "raw": "osx-audio@^1.0.0", - "scope": null, - "escapedName": "osx-audio", + "type": "version", + "registry": true, + "raw": "osx-audio@1.0.0", "name": "osx-audio", - "rawSpec": "^1.0.0", - "spec": ">=1.0.0 <2.0.0", - "type": "range" + "escapedName": "osx-audio", + "rawSpec": "1.0.0", + "saveSpec": null, + "fetchSpec": "1.0.0" }, "_requiredBy": [ "/webcast-osx-audio" ], "_resolved": "https://registry.npmjs.org/osx-audio/-/osx-audio-1.0.0.tgz", - "_shasum": "1469db42b4ff9afea373d7a0c56a4d7d9d04ef3f", - "_shrinkwrap": null, - "_spec": "osx-audio@^1.0.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/webcast-osx-audio", + "_spec": "1.0.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Nathan Wittstock", "email": "nate@milkandtang.com" @@ -58,16 +40,9 @@ "nan": "^2.3.3" }, "description": "Access to Mac OS X Audio I/O as streams. Only input is supported so far.", - "devDependencies": {}, - "directories": {}, - "dist": { - "shasum": "1469db42b4ff9afea373d7a0c56a4d7d9d04ef3f", - "tarball": "https://registry.npmjs.org/osx-audio/-/osx-audio-1.0.0.tgz" - }, "engines": { "node": ">=0.10.30" }, - "gitHead": "7f36409118c22953eeddafc3dd6acc91b062c079", "gypfile": true, "homepage": "https://github.com/fardog/node-osx-audio#readme", "keywords": [ @@ -82,18 +57,10 @@ ], "license": "MIT", "main": "index.js", - "maintainers": [ - { - "name": "fardog", - "email": "code@fardogllc.com" - } - ], "name": "osx-audio", - "optionalDependencies": {}, "os": [ "darwin" ], - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/fardog/node-osx-audio.git" diff --git a/nodejs/node_modules/parseurl/HISTORY.md b/nodejs/node_modules/parseurl/HISTORY.md index 395041ee6..4803393a9 100644 --- a/nodejs/node_modules/parseurl/HISTORY.md +++ b/nodejs/node_modules/parseurl/HISTORY.md @@ -1,3 +1,9 @@ +1.3.2 / 2017-09-09 +================== + + * perf: reduce overhead for full URLs + * perf: unroll the "fast-path" `RegExp` + 1.3.1 / 2016-01-17 ================== diff --git a/nodejs/node_modules/parseurl/LICENSE b/nodejs/node_modules/parseurl/LICENSE index ec7dfe7be..27653d3db 100644 --- a/nodejs/node_modules/parseurl/LICENSE +++ b/nodejs/node_modules/parseurl/LICENSE @@ -2,7 +2,7 @@ (The MIT License) Copyright (c) 2014 Jonathan Ong -Copyright (c) 2014 Douglas Christopher Wilson +Copyright (c) 2014-2017 Douglas Christopher Wilson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/nodejs/node_modules/parseurl/README.md b/nodejs/node_modules/parseurl/README.md index f4796ebbc..a5ccc51b0 100644 --- a/nodejs/node_modules/parseurl/README.md +++ b/nodejs/node_modules/parseurl/README.md @@ -10,7 +10,11 @@ Parse a URL with memoization. ## Install -```bash +This is a [Node.js](https://nodejs.org/en/) module available through the +[npm registry](https://www.npmjs.com/). Installation is done using the +[`npm install` command](https://docs.npmjs.com/getting-started/installing-npm-packages-locally): + +```sh $ npm install parseurl ``` @@ -40,68 +44,68 @@ does not change will return a cached parsed object, rather than parsing again. ```bash $ npm run-script bench -> parseurl@1.3.1 bench nodejs-parseurl +> parseurl@1.3.2 bench nodejs-parseurl > node benchmark/index.js + http_parser@2.7.0 + node@4.8.4 + v8@4.5.103.47 + uv@1.9.1 + zlib@1.2.11 + ares@1.10.1-DEV + icu@56.1 + modules@46 + openssl@1.0.2k + > node benchmark/fullurl.js Parsing URL "http://localhost:8888/foo/bar?user=tj&pet=fluffy" - 1 test completed. - 2 tests completed. 3 tests completed. - fasturl x 1,290,780 ops/sec ±0.46% (195 runs sampled) - nativeurl x 56,401 ops/sec ±0.22% (196 runs sampled) - parseurl x 55,231 ops/sec ±0.22% (194 runs sampled) + fasturl x 1,246,766 ops/sec ±0.74% (188 runs sampled) + nativeurl x 91,536 ops/sec ±0.54% (189 runs sampled) + parseurl x 90,645 ops/sec ±0.38% (189 runs sampled) > node benchmark/pathquery.js Parsing URL "/foo/bar?user=tj&pet=fluffy" - 1 test completed. - 2 tests completed. 3 tests completed. - fasturl x 1,986,668 ops/sec ±0.27% (190 runs sampled) - nativeurl x 98,740 ops/sec ±0.21% (195 runs sampled) - parseurl x 2,628,171 ops/sec ±0.36% (195 runs sampled) + fasturl x 2,077,650 ops/sec ±0.69% (186 runs sampled) + nativeurl x 638,669 ops/sec ±0.67% (189 runs sampled) + parseurl x 2,431,842 ops/sec ±0.71% (189 runs sampled) > node benchmark/samerequest.js Parsing URL "/foo/bar?user=tj&pet=fluffy" on same request object - 1 test completed. - 2 tests completed. 3 tests completed. - fasturl x 2,184,468 ops/sec ±0.40% (194 runs sampled) - nativeurl x 99,437 ops/sec ±0.71% (194 runs sampled) - parseurl x 10,498,005 ops/sec ±0.61% (186 runs sampled) + fasturl x 2,135,391 ops/sec ±0.69% (188 runs sampled) + nativeurl x 672,809 ops/sec ±3.83% (186 runs sampled) + parseurl x 11,604,947 ops/sec ±0.70% (189 runs sampled) > node benchmark/simplepath.js Parsing URL "/foo/bar" - 1 test completed. - 2 tests completed. 3 tests completed. - fasturl x 4,535,825 ops/sec ±0.27% (191 runs sampled) - nativeurl x 98,769 ops/sec ±0.54% (191 runs sampled) - parseurl x 4,164,865 ops/sec ±0.34% (192 runs sampled) + fasturl x 4,961,391 ops/sec ±0.97% (186 runs sampled) + nativeurl x 914,931 ops/sec ±0.83% (186 runs sampled) + parseurl x 7,559,196 ops/sec ±0.66% (188 runs sampled) > node benchmark/slash.js Parsing URL "/" - 1 test completed. - 2 tests completed. 3 tests completed. - fasturl x 4,908,405 ops/sec ±0.42% (191 runs sampled) - nativeurl x 100,945 ops/sec ±0.59% (188 runs sampled) - parseurl x 4,333,208 ops/sec ±0.27% (194 runs sampled) + fasturl x 4,053,379 ops/sec ±0.91% (187 runs sampled) + nativeurl x 963,999 ops/sec ±0.58% (189 runs sampled) + parseurl x 11,516,143 ops/sec ±0.58% (188 runs sampled) ``` ## License @@ -111,7 +115,7 @@ $ npm run-script bench [npm-image]: https://img.shields.io/npm/v/parseurl.svg [npm-url]: https://npmjs.org/package/parseurl [node-version-image]: https://img.shields.io/node/v/parseurl.svg -[node-version-url]: http://nodejs.org/download/ +[node-version-url]: https://nodejs.org/en/download/ [travis-image]: https://img.shields.io/travis/pillarjs/parseurl/master.svg [travis-url]: https://travis-ci.org/pillarjs/parseurl [coveralls-image]: https://img.shields.io/coveralls/pillarjs/parseurl/master.svg diff --git a/nodejs/node_modules/parseurl/index.js b/nodejs/node_modules/parseurl/index.js index 56cc6ec7e..603eabe12 100644 --- a/nodejs/node_modules/parseurl/index.js +++ b/nodejs/node_modules/parseurl/index.js @@ -1,7 +1,7 @@ /*! * parseurl * Copyright(c) 2014 Jonathan Ong - * Copyright(c) 2014 Douglas Christopher Wilson + * Copyright(c) 2014-2017 Douglas Christopher Wilson * MIT Licensed */ @@ -9,6 +9,7 @@ /** * Module dependencies. + * @private */ var url = require('url') @@ -16,14 +17,8 @@ var parse = url.parse var Url = url.Url /** - * Pattern for a simple path case. - * See: https://github.com/joyent/node/pull/7878 - */ - -var simplePathRegExp = /^(\/\/?(?!\/)[^\?#\s]*)(\?[^#\s]*)?$/ - -/** - * Exports. + * Module exports. + * @public */ module.exports = parseurl @@ -34,10 +29,10 @@ module.exports.original = originalurl * * @param {ServerRequest} req * @return {Object} - * @api public + * @public */ -function parseurl(req) { +function parseurl (req) { var url = req.url if (url === undefined) { @@ -56,7 +51,7 @@ function parseurl(req) { parsed = fastparse(url) parsed._raw = url - return req._parsedUrl = parsed + return (req._parsedUrl = parsed) }; /** @@ -64,10 +59,10 @@ function parseurl(req) { * * @param {ServerRequest} req * @return {Object} - * @api public + * @public */ -function originalurl(req) { +function originalurl (req) { var url = req.originalUrl if (typeof url !== 'string') { @@ -86,7 +81,7 @@ function originalurl(req) { parsed = fastparse(url) parsed._raw = url - return req._parsedOriginalUrl = parsed + return (req._parsedOriginalUrl = parsed) }; /** @@ -94,31 +89,52 @@ function originalurl(req) { * * @param {string} str * @return {Object} - * @api private + * @private */ -function fastparse(str) { - // Try fast path regexp - // See: https://github.com/joyent/node/pull/7878 - var simplePath = typeof str === 'string' && simplePathRegExp.exec(str) - - // Construct simple URL - if (simplePath) { - var pathname = simplePath[1] - var search = simplePath[2] || null - var url = Url !== undefined - ? new Url() - : {} - url.path = str - url.href = str - url.pathname = pathname - url.search = search - url.query = search && search.substr(1) - - return url +function fastparse (str) { + if (typeof str !== 'string' || str.charCodeAt(0) !== 0x2f /* / */) { + return parse(str) } - return parse(str) + var pathname = str + var query = null + var search = null + + // This takes the regexp from https://github.com/joyent/node/pull/7878 + // Which is /^(\/[^?#\s]*)(\?[^#\s]*)?$/ + // And unrolls it into a for loop + for (var i = 1; i < str.length; i++) { + switch (str.charCodeAt(i)) { + case 0x3f: /* ? */ + if (search === null) { + pathname = str.substring(0, i) + query = str.substring(i + 1) + search = str.substring(i) + } + break + case 0x09: /* \t */ + case 0x0a: /* \n */ + case 0x0c: /* \f */ + case 0x0d: /* \r */ + case 0x20: /* */ + case 0x23: /* # */ + case 0xa0: + case 0xfeff: + return parse(str) + } + } + + var url = Url !== undefined + ? new Url() + : {} + url.path = str + url.href = str + url.pathname = pathname + url.query = query + url.search = search + + return url } /** @@ -127,12 +143,12 @@ function fastparse(str) { * @param {string} url * @param {object} parsedUrl * @return {boolean} - * @api private + * @private */ -function fresh(url, parsedUrl) { - return typeof parsedUrl === 'object' - && parsedUrl !== null - && (Url === undefined || parsedUrl instanceof Url) - && parsedUrl._raw === url +function fresh (url, parsedUrl) { + return typeof parsedUrl === 'object' && + parsedUrl !== null && + (Url === undefined || parsedUrl instanceof Url) && + parsedUrl._raw === url } diff --git a/nodejs/node_modules/parseurl/package.json b/nodejs/node_modules/parseurl/package.json index 6d3deba21..0f7b713aa 100644 --- a/nodejs/node_modules/parseurl/package.json +++ b/nodejs/node_modules/parseurl/package.json @@ -1,52 +1,34 @@ { "_args": [ [ - { - "raw": "parseurl@~1.3.1", - "scope": null, - "escapedName": "parseurl", - "name": "parseurl", - "rawSpec": "~1.3.1", - "spec": ">=1.3.1 <1.4.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "parseurl@1.3.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "parseurl@>=1.3.1 <1.4.0", - "_id": "parseurl@1.3.1", - "_inCache": true, + "_from": "parseurl@1.3.2", + "_id": "parseurl@1.3.2", + "_inBundle": false, + "_integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", "_location": "/parseurl", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "parseurl@~1.3.1", - "scope": null, - "escapedName": "parseurl", + "type": "version", + "registry": true, + "raw": "parseurl@1.3.2", "name": "parseurl", - "rawSpec": "~1.3.1", - "spec": ">=1.3.1 <1.4.0", - "type": "range" + "escapedName": "parseurl", + "rawSpec": "1.3.2", + "saveSpec": null, + "fetchSpec": "1.3.2" }, "_requiredBy": [ "/express", "/finalhandler", "/serve-static" ], - "_resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", - "_shasum": "c8ab8c9223ba34888aa64a297b28853bec18da56", - "_shrinkwrap": null, - "_spec": "parseurl@~1.3.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", - "author": { - "name": "Jonathan Ong", - "email": "me@jongleberry.com", - "url": "http://jongleberry.com" - }, + "_resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "_spec": "1.3.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/pillarjs/parseurl/issues" }, @@ -54,21 +36,26 @@ { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" + }, + { + "name": "Jonathan Ong", + "email": "me@jongleberry.com", + "url": "http://jongleberry.com" } ], - "dependencies": {}, "description": "parse a url with memoization", "devDependencies": { "beautify-benchmark": "0.2.4", - "benchmark": "2.0.0", + "benchmark": "2.1.4", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", "fast-url-parser": "1.1.3", - "istanbul": "0.4.2", - "mocha": "~1.21.5" - }, - "directories": {}, - "dist": { - "shasum": "c8ab8c9223ba34888aa64a297b28853bec18da56", - "tarball": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz" + "istanbul": "0.4.5", + "mocha": "2.5.3" }, "engines": { "node": ">= 0.8" @@ -79,47 +66,19 @@ "README.md", "index.js" ], - "gitHead": "6d22d376d75b927ab2b5347ce3a1d6735133dd43", - "homepage": "https://github.com/pillarjs/parseurl", + "homepage": "https://github.com/pillarjs/parseurl#readme", "license": "MIT", - "maintainers": [ - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "tjholowaychuk", - "email": "tj@vision-media.ca" - }, - { - "name": "mscdex", - "email": "mscdex@mscdex.net" - }, - { - "name": "fishrock123", - "email": "fishrock123@rocketmail.com" - }, - { - "name": "defunctzombie", - "email": "shtylman@gmail.com" - } - ], "name": "parseurl", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/pillarjs/parseurl.git" }, "scripts": { "bench": "node benchmark/index.js", + "lint": "eslint .", "test": "mocha --check-leaks --bail --reporter spec test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --check-leaks --reporter dot test/", "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --check-leaks --reporter spec test/" }, - "version": "1.3.1" + "version": "1.3.2" } diff --git a/nodejs/node_modules/path-to-regexp/package.json b/nodejs/node_modules/path-to-regexp/package.json index cfecfcdca..b90846aff 100644 --- a/nodejs/node_modules/path-to-regexp/package.json +++ b/nodejs/node_modules/path-to-regexp/package.json @@ -1,46 +1,32 @@ { "_args": [ [ - { - "raw": "path-to-regexp@0.1.7", - "scope": null, - "escapedName": "path-to-regexp", - "name": "path-to-regexp", - "rawSpec": "0.1.7", - "spec": "0.1.7", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "path-to-regexp@0.1.7", + "/Users/muammar/github/mkchromecast/nodejs" ] ], "_from": "path-to-regexp@0.1.7", "_id": "path-to-regexp@0.1.7", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", "_location": "/path-to-regexp", - "_nodeVersion": "2.3.3", - "_npmUser": { - "name": "blakeembrey", - "email": "hello@blakeembrey.com" - }, - "_npmVersion": "2.13.2", "_phantomChildren": {}, "_requested": { + "type": "version", + "registry": true, "raw": "path-to-regexp@0.1.7", - "scope": null, - "escapedName": "path-to-regexp", "name": "path-to-regexp", + "escapedName": "path-to-regexp", "rawSpec": "0.1.7", - "spec": "0.1.7", - "type": "version" + "saveSpec": null, + "fetchSpec": "0.1.7" }, "_requiredBy": [ "/express" ], "_resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "_shasum": "df604178005f522f15eb4490e7247a1bfaa67f8c", - "_shrinkwrap": null, - "_spec": "path-to-regexp@0.1.7", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "0.1.7", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/component/path-to-regexp/issues" }, @@ -49,165 +35,22 @@ "path-to-regexp": "index.js" } }, - "dependencies": {}, "description": "Express style path to RegExp utility", "devDependencies": { "istanbul": "^0.2.6", "mocha": "^1.17.1" }, - "directories": {}, - "dist": { - "shasum": "df604178005f522f15eb4490e7247a1bfaa67f8c", - "tarball": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" - }, "files": [ "index.js", "LICENSE" ], - "gitHead": "039118d6c3c186d3f176c73935ca887a32a33d93", "homepage": "https://github.com/component/path-to-regexp#readme", "keywords": [ "express", "regexp" ], "license": "MIT", - "maintainers": [ - { - "name": "tjholowaychuk", - "email": "tj@vision-media.ca" - }, - { - "name": "hughsk", - "email": "hughskennedy@gmail.com" - }, - { - "name": "timaschew", - "email": "timaschew@gmail.com" - }, - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "dominicbarnes", - "email": "dominic@dbarnes.info" - }, - { - "name": "tootallnate", - "email": "nathan@tootallnate.net" - }, - { - "name": "rauchg", - "email": "rauchg@gmail.com" - }, - { - "name": "retrofox", - "email": "rdsuarez@gmail.com" - }, - { - "name": "coreh", - "email": "thecoreh@gmail.com" - }, - { - "name": "forbeslindesay", - "email": "forbes@lindesay.co.uk" - }, - { - "name": "kelonye", - "email": "kelonyemitchel@gmail.com" - }, - { - "name": "mattmueller", - "email": "mattmuelle@gmail.com" - }, - { - "name": "yields", - "email": "yields@icloud.com" - }, - { - "name": "anthonyshort", - "email": "antshort@gmail.com" - }, - { - "name": "ianstormtaylor", - "email": "ian@ianstormtaylor.com" - }, - { - "name": "cristiandouce", - "email": "cristian@gravityonmars.com" - }, - { - "name": "swatinem", - "email": "arpad.borsos@googlemail.com" - }, - { - "name": "stagas", - "email": "gstagas@gmail.com" - }, - { - "name": "amasad", - "email": "amjad.masad@gmail.com" - }, - { - "name": "juliangruber", - "email": "julian@juliangruber.com" - }, - { - "name": "calvinfo", - "email": "calvin@calv.info" - }, - { - "name": "blakeembrey", - "email": "hello@blakeembrey.com" - }, - { - "name": "timoxley", - "email": "secoif@gmail.com" - }, - { - "name": "jonathanong", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "queckezz", - "email": "fabian.eichenberger@gmail.com" - }, - { - "name": "nami-doc", - "email": "vendethiel@hotmail.fr" - }, - { - "name": "clintwood", - "email": "clint@anotherway.co.za" - }, - { - "name": "thehydroimpulse", - "email": "dnfagnan@gmail.com" - }, - { - "name": "stephenmathieson", - "email": "me@stephenmathieson.com" - }, - { - "name": "trevorgerhardt", - "email": "trevorgerhardt@gmail.com" - }, - { - "name": "dfcreative", - "email": "df.creative@gmail.com" - }, - { - "name": "defunctzombie", - "email": "shtylman@gmail.com" - } - ], "name": "path-to-regexp", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/component/path-to-regexp.git" diff --git a/nodejs/node_modules/proxy-addr/HISTORY.md b/nodejs/node_modules/proxy-addr/HISTORY.md index 9a62abc9a..c1c8205b6 100644 --- a/nodejs/node_modules/proxy-addr/HISTORY.md +++ b/nodejs/node_modules/proxy-addr/HISTORY.md @@ -1,3 +1,29 @@ +2.0.2 / 2017-09-24 +================== + + * deps: forwarded@~0.1.2 + - perf: improve header parsing + - perf: reduce overhead when no `X-Forwarded-For` header + +2.0.1 / 2017-09-10 +================== + + * deps: forwarded@~0.1.1 + - Fix trimming leading / trailing OWS + - perf: hoist regular expression + * deps: ipaddr.js@1.5.2 + +2.0.0 / 2017-08-08 +================== + + * Drop support for Node.js below 0.10 + +1.1.5 / 2017-07-25 +================== + + * Fix array argument being altered + * deps: ipaddr.js@1.4.0 + 1.1.4 / 2017-03-24 ================== diff --git a/nodejs/node_modules/proxy-addr/README.md b/nodejs/node_modules/proxy-addr/README.md index 6b1075aaf..22d7e14f2 100644 --- a/nodejs/node_modules/proxy-addr/README.md +++ b/nodejs/node_modules/proxy-addr/README.md @@ -20,6 +20,8 @@ $ npm install proxy-addr ## API + + ```js var proxyaddr = require('proxy-addr') ``` @@ -32,15 +34,19 @@ The `trust` argument is a function that returns `true` if you trust the address, `false` if you don't. The closest untrusted address is returned. + + ```js -proxyaddr(req, function(addr){ return addr === '127.0.0.1' }) -proxyaddr(req, function(addr, i){ return i < 1 }) +proxyaddr(req, function (addr) { return addr === '127.0.0.1' }) +proxyaddr(req, function (addr, i) { return i < 1 }) ``` The `trust` arugment may also be a single IP address string or an array of trusted addresses, as plain IP addresses, CIDR-formatted strings, or IP/netmask strings. + + ```js proxyaddr(req, '127.0.0.1') proxyaddr(req, ['127.0.0.0/8', '10.0.0.0/8']) @@ -50,6 +56,8 @@ proxyaddr(req, ['127.0.0.0/255.0.0.0', '192.168.0.0/255.255.0.0']) This module also supports IPv6. Your IPv6 addresses will be normalized automatically (i.e. `fe80::00ed:1` equals `fe80:0:0:0:0:0:ed:1`). + + ```js proxyaddr(req, '::1') proxyaddr(req, ['::1/128', 'fe80::/10']) @@ -62,6 +70,8 @@ not have to specify both `::ffff:a00:1` and `10.0.0.1`. As a convenience, this module also takes certain pre-defined names in addition to IP addresses, which expand into IP addresses: + + ```js proxyaddr(req, 'loopback') proxyaddr(req, ['loopback', 'fc00:ac:1ab5:fff::1/64']) @@ -86,6 +96,8 @@ Return all the addresses of the request, optionally stopping at the first untrusted. This array is ordered from closest to furthest (i.e. `arr[0] === req.connection.remoteAddress`). + + ```js proxyaddr.all(req) ``` @@ -93,6 +105,8 @@ proxyaddr.all(req) The optional `trust` argument takes the same arguments as `trust` does in `proxyaddr(req, trust)`. + + ```js proxyaddr.all(req, 'loopback') ``` @@ -103,9 +117,11 @@ Compiles argument `val` into a `trust` function. This function takes the same arguments as `trust` does in `proxyaddr(req, trust)` and returns a function suitable for `proxyaddr(req, trust)`. + + ```js var trust = proxyaddr.compile('localhost') -var addr = proxyaddr(req, trust) +var addr = proxyaddr(req, trust) ``` This function is meant to be optimized for use against every request. diff --git a/nodejs/node_modules/proxy-addr/index.js b/nodejs/node_modules/proxy-addr/index.js index 2dad636eb..50c561f7d 100644 --- a/nodejs/node_modules/proxy-addr/index.js +++ b/nodejs/node_modules/proxy-addr/index.js @@ -11,37 +11,37 @@ * @public */ -module.exports = proxyaddr; -module.exports.all = alladdrs; -module.exports.compile = compile; +module.exports = proxyaddr +module.exports.all = alladdrs +module.exports.compile = compile /** * Module dependencies. * @private */ -var forwarded = require('forwarded'); -var ipaddr = require('ipaddr.js'); +var forwarded = require('forwarded') +var ipaddr = require('ipaddr.js') /** * Variables. * @private */ -var digitre = /^[0-9]+$/; -var isip = ipaddr.isValid; -var parseip = ipaddr.parse; +var DIGIT_REGEXP = /^[0-9]+$/ +var isip = ipaddr.isValid +var parseip = ipaddr.parse /** * Pre-defined IP ranges. * @private */ -var ipranges = { +var IP_RANGES = { linklocal: ['169.254.0.0/16', 'fe80::/10'], loopback: ['127.0.0.1/8', '::1/128'], uniquelocal: ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16', 'fc00::/7'] -}; +} /** * Get all addresses in the request, optionally stopping @@ -52,26 +52,26 @@ var ipranges = { * @public */ -function alladdrs(req, trust) { +function alladdrs (req, trust) { // get addresses - var addrs = forwarded(req); + var addrs = forwarded(req) if (!trust) { // Return all addresses - return addrs; + return addrs } if (typeof trust !== 'function') { - trust = compile(trust); + trust = compile(trust) } for (var i = 0; i < addrs.length - 1; i++) { - if (trust(addrs[i], i)) continue; + if (trust(addrs[i], i)) continue - addrs.length = i + 1; + addrs.length = i + 1 } - return addrs; + return addrs } /** @@ -81,33 +81,35 @@ function alladdrs(req, trust) { * @private */ -function compile(val) { +function compile (val) { if (!val) { - throw new TypeError('argument is required'); + throw new TypeError('argument is required') } - var trust = typeof val === 'string' - ? [val] - : val; + var trust - if (!Array.isArray(trust)) { - throw new TypeError('unsupported trust argument'); + if (typeof val === 'string') { + trust = [val] + } else if (Array.isArray(val)) { + trust = val.slice() + } else { + throw new TypeError('unsupported trust argument') } for (var i = 0; i < trust.length; i++) { - val = trust[i]; + val = trust[i] - if (!ipranges.hasOwnProperty(val)) { - continue; + if (!IP_RANGES.hasOwnProperty(val)) { + continue } // Splice in pre-defined range - val = ipranges[val]; - trust.splice.apply(trust, [i, 1].concat(val)); - i += val.length - 1; + val = IP_RANGES[val] + trust.splice.apply(trust, [i, 1].concat(val)) + i += val.length - 1 } - return compileTrust(compileRangeSubnets(trust)); + return compileTrust(compileRangeSubnets(trust)) } /** @@ -117,14 +119,14 @@ function compile(val) { * @private */ -function compileRangeSubnets(arr) { - var rangeSubnets = new Array(arr.length); +function compileRangeSubnets (arr) { + var rangeSubnets = new Array(arr.length) for (var i = 0; i < arr.length; i++) { - rangeSubnets[i] = parseipNotation(arr[i]); + rangeSubnets[i] = parseipNotation(arr[i]) } - return rangeSubnets; + return rangeSubnets } /** @@ -134,14 +136,14 @@ function compileRangeSubnets(arr) { * @private */ -function compileTrust(rangeSubnets) { +function compileTrust (rangeSubnets) { // Return optimized function based on length - var len = rangeSubnets.length; + var len = rangeSubnets.length return len === 0 ? trustNone : len === 1 ? trustSingle(rangeSubnets[0]) - : trustMulti(rangeSubnets); + : trustMulti(rangeSubnets) } /** @@ -151,46 +153,46 @@ function compileTrust(rangeSubnets) { * @private */ -function parseipNotation(note) { - var pos = note.lastIndexOf('/'); +function parseipNotation (note) { + var pos = note.lastIndexOf('/') var str = pos !== -1 ? note.substring(0, pos) - : note; + : note if (!isip(str)) { - throw new TypeError('invalid IP address: ' + str); + throw new TypeError('invalid IP address: ' + str) } - var ip = parseip(str); + var ip = parseip(str) if (pos === -1 && ip.kind() === 'ipv6' && ip.isIPv4MappedAddress()) { // Store as IPv4 - ip = ip.toIPv4Address(); + ip = ip.toIPv4Address() } var max = ip.kind() === 'ipv6' ? 128 - : 32; + : 32 var range = pos !== -1 ? note.substring(pos + 1, note.length) - : null; + : null if (range === null) { - range = max; - } else if (digitre.test(range)) { - range = parseInt(range, 10); + range = max + } else if (DIGIT_REGEXP.test(range)) { + range = parseInt(range, 10) } else if (ip.kind() === 'ipv4' && isip(range)) { - range = parseNetmask(range); + range = parseNetmask(range) } else { - range = null; + range = null } if (range <= 0 || range > max) { - throw new TypeError('invalid range on address: ' + note); + throw new TypeError('invalid range on address: ' + note) } - return [ip, range]; + return [ip, range] } /** @@ -200,13 +202,13 @@ function parseipNotation(note) { * @private */ -function parseNetmask(netmask) { - var ip = parseip(netmask); - var kind = ip.kind(); +function parseNetmask (netmask) { + var ip = parseip(netmask) + var kind = ip.kind() return kind === 'ipv4' ? ip.prefixLengthFromSubnetMask() - : null; + : null } /** @@ -217,19 +219,19 @@ function parseNetmask(netmask) { * @public */ -function proxyaddr(req, trust) { +function proxyaddr (req, trust) { if (!req) { - throw new TypeError('req argument is required'); + throw new TypeError('req argument is required') } if (!trust) { - throw new TypeError('trust argument is required'); + throw new TypeError('trust argument is required') } - var addrs = alladdrs(req, trust); - var addr = addrs[addrs.length - 1]; + var addrs = alladdrs(req, trust) + var addr = addrs[addrs.length - 1] - return addr; + return addr } /** @@ -238,8 +240,8 @@ function proxyaddr(req, trust) { * @private */ -function trustNone() { - return false; +function trustNone () { + return false } /** @@ -249,44 +251,44 @@ function trustNone() { * @private */ -function trustMulti(subnets) { - return function trust(addr) { - if (!isip(addr)) return false; +function trustMulti (subnets) { + return function trust (addr) { + if (!isip(addr)) return false - var ip = parseip(addr); - var ipconv; - var kind = ip.kind(); + var ip = parseip(addr) + var ipconv + var kind = ip.kind() for (var i = 0; i < subnets.length; i++) { - var subnet = subnets[i]; - var subnetip = subnet[0]; - var subnetkind = subnetip.kind(); - var subnetrange = subnet[1]; - var trusted = ip; + var subnet = subnets[i] + var subnetip = subnet[0] + var subnetkind = subnetip.kind() + var subnetrange = subnet[1] + var trusted = ip if (kind !== subnetkind) { if (subnetkind === 'ipv4' && !ip.isIPv4MappedAddress()) { // Incompatible IP addresses - continue; + continue } if (!ipconv) { // Convert IP to match subnet IP kind ipconv = subnetkind === 'ipv4' ? ip.toIPv4Address() - : ip.toIPv4MappedAddress(); + : ip.toIPv4MappedAddress() } - trusted = ipconv; + trusted = ipconv } if (trusted.match(subnetip, subnetrange)) { - return true; + return true } } - return false; - }; + return false + } } /** @@ -296,30 +298,30 @@ function trustMulti(subnets) { * @private */ -function trustSingle(subnet) { - var subnetip = subnet[0]; - var subnetkind = subnetip.kind(); - var subnetisipv4 = subnetkind === 'ipv4'; - var subnetrange = subnet[1]; +function trustSingle (subnet) { + var subnetip = subnet[0] + var subnetkind = subnetip.kind() + var subnetisipv4 = subnetkind === 'ipv4' + var subnetrange = subnet[1] - return function trust(addr) { - if (!isip(addr)) return false; + return function trust (addr) { + if (!isip(addr)) return false - var ip = parseip(addr); - var kind = ip.kind(); + var ip = parseip(addr) + var kind = ip.kind() if (kind !== subnetkind) { if (subnetisipv4 && !ip.isIPv4MappedAddress()) { // Incompatible IP addresses - return false; + return false } // Convert IP to match subnet IP kind ip = subnetisipv4 ? ip.toIPv4Address() - : ip.toIPv4MappedAddress(); + : ip.toIPv4MappedAddress() } - return ip.match(subnetip, subnetrange); - }; + return ip.match(subnetip, subnetrange) + } } diff --git a/nodejs/node_modules/proxy-addr/package.json b/nodejs/node_modules/proxy-addr/package.json index aa22688f8..c9393bb99 100644 --- a/nodejs/node_modules/proxy-addr/package.json +++ b/nodejs/node_modules/proxy-addr/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "proxy-addr@~1.1.3", - "scope": null, - "escapedName": "proxy-addr", - "name": "proxy-addr", - "rawSpec": "~1.1.3", - "spec": ">=1.1.3 <1.2.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "proxy-addr@2.0.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "proxy-addr@>=1.1.3 <1.2.0", - "_id": "proxy-addr@1.1.4", - "_inCache": true, + "_from": "proxy-addr@2.0.2", + "_id": "proxy-addr@2.0.2", + "_inBundle": false, + "_integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=", "_location": "/proxy-addr", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/proxy-addr-1.1.4.tgz_1490396252699_0.9566438721958548" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "proxy-addr@~1.1.3", - "scope": null, - "escapedName": "proxy-addr", + "type": "version", + "registry": true, + "raw": "proxy-addr@2.0.2", "name": "proxy-addr", - "rawSpec": "~1.1.3", - "spec": ">=1.1.3 <1.2.0", - "type": "range" + "escapedName": "proxy-addr", + "rawSpec": "2.0.2", + "saveSpec": null, + "fetchSpec": "2.0.2" }, "_requiredBy": [ "/express" ], - "_resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz", - "_shasum": "27e545f6960a44a627d9b44467e35c1b6b4ce2f3", - "_shrinkwrap": null, - "_spec": "proxy-addr@~1.1.3", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz", + "_spec": "2.0.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" @@ -53,23 +35,25 @@ "url": "https://github.com/jshttp/proxy-addr/issues" }, "dependencies": { - "forwarded": "~0.1.0", - "ipaddr.js": "1.3.0" + "forwarded": "~0.1.2", + "ipaddr.js": "1.5.2" }, "description": "Determine address of proxied request", "devDependencies": { "beautify-benchmark": "0.2.4", - "benchmark": "2.1.3", - "istanbul": "0.4.5", - "mocha": "~1.21.5" - }, - "directories": {}, - "dist": { - "shasum": "27e545f6960a44a627d9b44467e35c1b6b4ce2f3", - "tarball": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz" + "benchmark": "2.1.4", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", + "mocha": "3.5.3", + "nyc": "10.3.2" }, "engines": { - "node": ">= 0.6" + "node": ">= 0.10" }, "files": [ "LICENSE", @@ -77,7 +61,6 @@ "README.md", "index.js" ], - "gitHead": "4c636264c036d9825e8a3cf50555a272e3246fe6", "homepage": "https://github.com/jshttp/proxy-addr#readme", "keywords": [ "ip", @@ -85,24 +68,17 @@ "x-forwarded-for" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "proxy-addr", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/proxy-addr.git" }, "scripts": { "bench": "node benchmark/index.js", + "lint": "eslint --plugin markdown --ext js,md .", "test": "mocha --reporter spec --bail --check-leaks test/", - "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/", - "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/" + "test-cov": "nyc --reporter=text npm test", + "test-travis": "nyc --reporter=html --reporter=text npm test" }, - "version": "1.1.4" + "version": "2.0.2" } diff --git a/nodejs/node_modules/qs/.editorconfig b/nodejs/node_modules/qs/.editorconfig new file mode 100644 index 000000000..b2654e7ac --- /dev/null +++ b/nodejs/node_modules/qs/.editorconfig @@ -0,0 +1,30 @@ +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +max_line_length = 140 + +[test/*] +max_line_length = off + +[*.md] +max_line_length = off + +[*.json] +max_line_length = off + +[Makefile] +max_line_length = off + +[CHANGELOG.md] +indent_style = space +indent_size = 2 + +[LICENSE] +indent_size = 2 +max_line_length = off diff --git a/nodejs/node_modules/qs/.eslintrc b/nodejs/node_modules/qs/.eslintrc index e2cade5ee..a33d179e7 100644 --- a/nodejs/node_modules/qs/.eslintrc +++ b/nodejs/node_modules/qs/.eslintrc @@ -4,15 +4,16 @@ "extends": "@ljharb", "rules": { - "complexity": [2, 26], + "complexity": [2, 28], "consistent-return": 1, + "func-name-matching": 0, "id-length": [2, { "min": 1, "max": 25, "properties": "never" }], "indent": [2, 4], "max-params": [2, 12], - "max-statements": [2, 43], + "max-statements": [2, 45], "no-continue": 1, "no-magic-numbers": 0, "no-restricted-syntax": [2, "BreakStatement", "DebuggerStatement", "ForInStatement", "LabeledStatement", "WithStatement"], - "operator-linebreak": [2, "after"], + "operator-linebreak": [2, "before"], } } diff --git a/nodejs/node_modules/qs/.jscs.json b/nodejs/node_modules/qs/.jscs.json deleted file mode 100644 index 3d099c4b1..000000000 --- a/nodejs/node_modules/qs/.jscs.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "es3": true, - - "additionalRules": [], - - "requireSemicolons": true, - - "disallowMultipleSpaces": true, - - "disallowIdentifierNames": [], - - "requireCurlyBraces": { - "allExcept": [], - "keywords": ["if", "else", "for", "while", "do", "try", "catch"] - }, - - "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"], - - "disallowSpaceAfterKeywords": [], - - "disallowSpaceBeforeComma": true, - "disallowSpaceAfterComma": false, - "disallowSpaceBeforeSemicolon": true, - - "disallowNodeTypes": [ - "DebuggerStatement", - "ForInStatement", - "LabeledStatement", - "SwitchCase", - "SwitchStatement", - "WithStatement" - ], - - "requireObjectKeysOnNewLine": { "allExcept": ["sameLine"] }, - - "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true }, - "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true }, - "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true }, - "requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true }, - "disallowSpacesInFunctionDeclaration": { "beforeOpeningRoundBrace": true }, - - "requireSpaceBetweenArguments": true, - - "disallowSpacesInsideParentheses": true, - - "disallowSpacesInsideArrayBrackets": true, - - "disallowQuotedKeysInObjects": { "allExcept": ["reserved"] }, - - "disallowSpaceAfterObjectKeys": true, - - "requireCommaBeforeLineBreak": true, - - "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], - "requireSpaceAfterPrefixUnaryOperators": [], - - "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], - "requireSpaceBeforePostfixUnaryOperators": [], - - "disallowSpaceBeforeBinaryOperators": [], - "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], - - "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], - "disallowSpaceAfterBinaryOperators": [], - - "disallowImplicitTypeConversion": ["binary", "string"], - - "disallowKeywords": ["with", "eval"], - - "requireKeywordsOnNewLine": [], - "disallowKeywordsOnNewLine": ["else"], - - "requireLineFeedAtFileEnd": true, - - "disallowTrailingWhitespace": true, - - "disallowTrailingComma": true, - - "excludeFiles": ["node_modules/**", "vendor/**"], - - "disallowMultipleLineStrings": true, - - "requireDotNotation": { "allExcept": ["keywords"] }, - - "requireParenthesesAroundIIFE": true, - - "validateLineBreaks": "LF", - - "validateQuoteMarks": { - "escape": true, - "mark": "'" - }, - - "disallowOperatorBeforeLineBreak": [], - - "requireSpaceBeforeKeywords": [ - "do", - "for", - "if", - "else", - "switch", - "case", - "try", - "catch", - "finally", - "while", - "with", - "return" - ], - - "validateAlignedFunctionParameters": { - "lineBreakAfterOpeningBraces": true, - "lineBreakBeforeClosingBraces": true - }, - - "requirePaddingNewLinesBeforeExport": true, - - "validateNewlineAfterArrayElements": { - "maximum": 1 - }, - - "requirePaddingNewLinesAfterUseStrict": true, - - "disallowArrowFunctions": true, - - "disallowMultiLineTernary": true, - - "validateOrderInObjectKeys": "asc-insensitive", - - "disallowIdenticalDestructuringNames": true, - - "disallowNestedTernaries": { "maxLevel": 1 }, - - "requireSpaceAfterComma": { "allExcept": ["trailing"] }, - "requireAlignedMultilineParams": false, - - "requireSpacesInGenerator": { - "afterStar": true - }, - - "disallowSpacesInGenerator": { - "beforeStar": true - }, - - "disallowVar": false, - - "requireArrayDestructuring": false, - - "requireEnhancedObjectLiterals": false, - - "requireObjectDestructuring": false, - - "requireEarlyReturn": false, - - "requireCapitalizedConstructorsNew": { - "allExcept": ["Function", "String", "Object", "Symbol", "Number", "Date", "RegExp", "Error", "Boolean", "Array"] - }, - - "requireImportAlphabetized": false, - - "requireSpaceBeforeObjectValues": true, - "requireSpaceBeforeDestructuredValues": true, - - "disallowSpacesInsideTemplateStringPlaceholders": true, - - "disallowArrayDestructuringReturn": false, - - "requireNewlineBeforeSingleStatementsInIf": false, - - "disallowUnusedVariables": true, - - "requireSpacesInsideImportedObjectBraces": true, - - "requireUseStrict": true -} - diff --git a/nodejs/node_modules/qs/CHANGELOG.md b/nodejs/node_modules/qs/CHANGELOG.md index 85e69b0a2..71d5a3e8f 100644 --- a/nodejs/node_modules/qs/CHANGELOG.md +++ b/nodejs/node_modules/qs/CHANGELOG.md @@ -1,3 +1,24 @@ +## **6.5.1** +- [Fix] Fix parsing & compacting very deep objects (#224) +- [Refactor] name utils functions +- [Dev Deps] update `eslint`, `@ljharb/eslint-config`, `tape` +- [Tests] up to `node` `v8.4`; use `nvm install-latest-npm` so newer npm doesn’t break older node +- [Tests] Use precise dist for Node.js 0.6 runtime (#225) +- [Tests] make 0.6 required, now that it’s passing +- [Tests] on `node` `v8.2`; fix npm on node 0.6 + +## **6.5.0** +- [New] add `utils.assign` +- [New] pass default encoder/decoder to custom encoder/decoder functions (#206) +- [New] `parse`/`stringify`: add `ignoreQueryPrefix`/`addQueryPrefix` options, respectively (#213) +- [Fix] Handle stringifying empty objects with addQueryPrefix (#217) +- [Fix] do not mutate `options` argument (#207) +- [Refactor] `parse`: cache index to reuse in else statement (#182) +- [Docs] add various badges to readme (#208) +- [Dev Deps] update `eslint`, `browserify`, `iconv-lite`, `tape` +- [Tests] up to `node` `v8.1`, `v7.10`, `v6.11`; npm v4.6 breaks on node < v1; npm v5+ breaks on node < v4 +- [Tests] add `editorconfig-tools` + ## **6.4.0** - [New] `qs.stringify`: add `encodeValuesOnly` option - [Fix] follow `allowPrototypes` option during merge (#201, #201) @@ -7,6 +28,13 @@ - [Tests] up to `node` `v7.7`, `v6.10`,` v4.8`; disable osx builds since they block linux builds - [eslint] reduce warnings +## **6.3.2** +- [Fix] follow `allowPrototypes` option during merge (#201, #200) +- [Dev Deps] update `eslint` +- [Fix] chmod a-x +- [Fix] support keys starting with brackets (#202, #200) +- [Tests] up to `node` `v7.7`, `v6.10`,` v4.8`; disable osx builds since they block linux builds + ## **6.3.1** - [Fix] ensure that `allowPrototypes: false` does not ever shadow Object.prototype properties (thanks, @snyk!) - [Dev Deps] update `eslint`, `@ljharb/eslint-config`, `browserify`, `iconv-lite`, `qs-iconv`, `tape` @@ -33,6 +61,12 @@ - [Tests] skip Object.create tests when null objects are not available - [Tests] Turn on eslint for test files (#175) +## **6.2.3** +- [Fix] follow `allowPrototypes` option during merge (#201, #200) +- [Fix] chmod a-x +- [Fix] support keys starting with brackets (#202, #200) +- [Tests] up to `node` `v7.7`, `v6.10`,` v4.8`; disable osx builds since they block linux builds + ## **6.2.2** - [Fix] ensure that `allowPrototypes: false` does not ever shadow Object.prototype properties @@ -48,6 +82,12 @@ - [New] add "encoder" and "decoder" options, for custom param encoding/decoding (#160) - [Fix] fix compacting of nested sparse arrays (#150) +## **6.1.2 +- [Fix] follow `allowPrototypes` option during merge (#201, #200) +- [Fix] chmod a-x +- [Fix] support keys starting with brackets (#202, #200) +- [Tests] up to `node` `v7.7`, `v6.10`,` v4.8`; disable osx builds since they block linux builds + ## **6.1.1** - [Fix] ensure that `allowPrototypes: false` does not ever shadow Object.prototype properties @@ -56,6 +96,12 @@ - [Fix] "sort" option should work at a depth of 3 or more (#151) - [Fix] Restore `dist` directory; will be removed in v7 (#148) +## **6.0.4** +- [Fix] follow `allowPrototypes` option during merge (#201, #200) +- [Fix] chmod a-x +- [Fix] support keys starting with brackets (#202, #200) +- [Tests] up to `node` `v7.7`, `v6.10`,` v4.8`; disable osx builds since they block linux builds + ## **6.0.3** - [Fix] ensure that `allowPrototypes: false` does not ever shadow Object.prototype properties - [Fix] Restore `dist` directory; will be removed in v7 (#148) diff --git a/nodejs/node_modules/qs/README.md b/nodejs/node_modules/qs/README.md index 32fc3123f..d81196662 100644 --- a/nodejs/node_modules/qs/README.md +++ b/nodejs/node_modules/qs/README.md @@ -1,8 +1,14 @@ -# qs +# qs [![Version Badge][2]][1] -A querystring parsing and stringifying library with some added security. +[![Build Status][3]][4] +[![dependency status][5]][6] +[![dev dependency status][7]][8] +[![License][license-image]][license-url] +[![Downloads][downloads-image]][downloads-url] + +[![npm badge][11]][1] -[![Build Status](https://api.travis-ci.org/ljharb/qs.svg)](http://travis-ci.org/ljharb/qs) +A querystring parsing and stringifying library with some added security. Lead Maintainer: [Jordan Harband](https://github.com/ljharb) @@ -33,9 +39,9 @@ For example, the string `'foo[bar]=baz'` converts to: ```javascript assert.deepEqual(qs.parse('foo[bar]=baz'), { - foo: { - bar: 'baz' - } + foo: { + bar: 'baz' + } }); ``` @@ -57,7 +63,7 @@ URI encoded strings work too: ```javascript assert.deepEqual(qs.parse('a%5Bb%5D=c'), { - a: { b: 'c' } + a: { b: 'c' } }); ``` @@ -65,11 +71,11 @@ You can also nest your objects, like `'foo[bar][baz]=foobarbaz'`: ```javascript assert.deepEqual(qs.parse('foo[bar][baz]=foobarbaz'), { - foo: { - bar: { - baz: 'foobarbaz' + foo: { + bar: { + baz: 'foobarbaz' + } } - } }); ``` @@ -78,19 +84,19 @@ By default, when nesting objects **qs** will only parse up to 5 children deep. T ```javascript var expected = { - a: { - b: { - c: { - d: { - e: { - f: { - '[g][h][i]': 'j' + a: { + b: { + c: { + d: { + e: { + f: { + '[g][h][i]': 'j' + } + } + } } - } } - } } - } }; var string = 'a[b][c][d][e][f][g][h][i]=j'; assert.deepEqual(qs.parse(string), expected); @@ -112,6 +118,13 @@ var limited = qs.parse('a=b&c=d', { parameterLimit: 1 }); assert.deepEqual(limited, { a: 'b' }); ``` +To bypass the leading question mark, use `ignoreQueryPrefix`: + +```javascript +var prefixed = qs.parse('?a=b&c=d', { ignoreQueryPrefix: true }); +assert.deepEqual(prefixed, { a: 'b', c: 'd' }); +``` + An optional delimiter can also be passed: ```javascript @@ -227,10 +240,10 @@ assert.equal(unencoded, 'a[b]=c'); Encoding can be disabled for keys by setting the `encodeValuesOnly` option to `true`: ```javascript -var encodedValues = qs.stringify( - { a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] }, - { encodeValuesOnly: true } -) +var encodedValues = qs.stringify( + { a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] }, + { encodeValuesOnly: true } +); assert.equal(encodedValues,'a=b&c[0]=d&c[1]=e%3Df&f[0][0]=g&f[1][0]=h'); ``` @@ -238,8 +251,8 @@ This encoding can also be replaced by a custom encoding method set as `encoder` ```javascript var encoded = qs.stringify({ a: { b: 'c' } }, { encoder: function (str) { - // Passed in values `a`, `b`, `c` - return // Return encoded string + // Passed in values `a`, `b`, `c` + return // Return encoded string }}) ``` @@ -249,8 +262,8 @@ Analogue to the `encoder` there is a `decoder` option for `parse` to override de ```javascript var decoded = qs.parse('x=z', { decoder: function (str) { - // Passed in values `x`, `z` - return // Return decoded string + // Passed in values `x`, `z` + return // Return decoded string }}) ``` @@ -317,6 +330,12 @@ Properties that are set to `undefined` will be omitted entirely: assert.equal(qs.stringify({ a: null, b: undefined }), 'a='); ``` +The query string may optionally be prepended with a question mark: + +```javascript +assert.equal(qs.stringify({ a: 'b', c: 'd' }, { addQueryPrefix: true }), '?a=b&c=d'); +``` + The delimiter may be overridden with stringify as well: ```javascript @@ -338,7 +357,7 @@ You may use the `sort` option to affect the order of parameter keys: ```javascript function alphabeticalSort(a, b) { - return a.localeCompare(b); + return a.localeCompare(b); } assert.equal(qs.stringify({ a: 'c', z: 'y', b : 'f' }, { sort: alphabeticalSort }), 'a=c&b=f&z=y'); ``` @@ -349,17 +368,17 @@ pass an array, it will be used to select properties and array indices for string ```javascript function filterFunc(prefix, value) { - if (prefix == 'b') { - // Return an `undefined` value to omit a property. - return; - } - if (prefix == 'e[f]') { - return value.getTime(); - } - if (prefix == 'e[g][0]') { - return value * 2; - } - return value; + if (prefix == 'b') { + // Return an `undefined` value to omit a property. + return; + } + if (prefix == 'e[f]') { + return value.getTime(); + } + if (prefix == 'e[g][0]') { + return value * 2; + } + return value; } qs.stringify({ a: 'b', c: 'd', e: { f: new Date(123), g: [2] } }, { filter: filterFunc }); // 'a=b&c=d&e[f]=123&e[g][0]=4' @@ -438,3 +457,19 @@ assert.equal(qs.stringify({ a: 'b c' }), 'a=b%20c'); assert.equal(qs.stringify({ a: 'b c' }, { format : 'RFC3986' }), 'a=b%20c'); assert.equal(qs.stringify({ a: 'b c' }, { format : 'RFC1738' }), 'a=b+c'); ``` + +[1]: https://npmjs.org/package/qs +[2]: http://versionbadg.es/ljharb/qs.svg +[3]: https://api.travis-ci.org/ljharb/qs.svg +[4]: https://travis-ci.org/ljharb/qs +[5]: https://david-dm.org/ljharb/qs.svg +[6]: https://david-dm.org/ljharb/qs +[7]: https://david-dm.org/ljharb/qs/dev-status.svg +[8]: https://david-dm.org/ljharb/qs?type=dev +[9]: https://ci.testling.com/ljharb/qs.png +[10]: https://ci.testling.com/ljharb/qs +[11]: https://nodei.co/npm/qs.png?downloads=true&stars=true +[license-image]: http://img.shields.io/npm/l/qs.svg +[license-url]: LICENSE +[downloads-image]: http://img.shields.io/npm/dm/qs.svg +[downloads-url]: http://npm-stat.com/charts.html?package=qs diff --git a/nodejs/node_modules/qs/dist/qs.js b/nodejs/node_modules/qs/dist/qs.js index 2d0d63ff2..713c6d1e8 100644 --- a/nodejs/node_modules/qs/dist/qs.js +++ b/nodejs/node_modules/qs/dist/qs.js @@ -52,19 +52,23 @@ var defaults = { var parseValues = function parseQueryStringValues(str, options) { var obj = {}; - var parts = str.split(options.delimiter, options.parameterLimit === Infinity ? undefined : options.parameterLimit); + var cleanStr = options.ignoreQueryPrefix ? str.replace(/^\?/, '') : str; + var limit = options.parameterLimit === Infinity ? undefined : options.parameterLimit; + var parts = cleanStr.split(options.delimiter, limit); for (var i = 0; i < parts.length; ++i) { var part = parts[i]; - var pos = part.indexOf(']=') === -1 ? part.indexOf('=') : part.indexOf(']=') + 1; + + var bracketEqualsPos = part.indexOf(']='); + var pos = bracketEqualsPos === -1 ? part.indexOf('=') : bracketEqualsPos + 1; var key, val; if (pos === -1) { - key = options.decoder(part); + key = options.decoder(part, defaults.decoder); val = options.strictNullHandling ? null : ''; } else { - key = options.decoder(part.slice(0, pos)); - val = options.decoder(part.slice(pos + 1)); + key = options.decoder(part.slice(0, pos), defaults.decoder); + val = options.decoder(part.slice(pos + 1), defaults.decoder); } if (has.call(obj, key)) { obj[key] = [].concat(obj[key]).concat(val); @@ -76,36 +80,38 @@ var parseValues = function parseQueryStringValues(str, options) { return obj; }; -var parseObject = function parseObjectRecursive(chain, val, options) { - if (!chain.length) { - return val; - } +var parseObject = function (chain, val, options) { + var leaf = val; - var root = chain.shift(); + for (var i = chain.length - 1; i >= 0; --i) { + var obj; + var root = chain[i]; - var obj; - if (root === '[]') { - obj = []; - obj = obj.concat(parseObject(chain, val, options)); - } else { - obj = options.plainObjects ? Object.create(null) : {}; - var cleanRoot = root.charAt(0) === '[' && root.charAt(root.length - 1) === ']' ? root.slice(1, -1) : root; - var index = parseInt(cleanRoot, 10); - if ( - !isNaN(index) && - root !== cleanRoot && - String(index) === cleanRoot && - index >= 0 && - (options.parseArrays && index <= options.arrayLimit) - ) { + if (root === '[]') { obj = []; - obj[index] = parseObject(chain, val, options); + obj = obj.concat(leaf); } else { - obj[cleanRoot] = parseObject(chain, val, options); + obj = options.plainObjects ? Object.create(null) : {}; + var cleanRoot = root.charAt(0) === '[' && root.charAt(root.length - 1) === ']' ? root.slice(1, -1) : root; + var index = parseInt(cleanRoot, 10); + if ( + !isNaN(index) + && root !== cleanRoot + && String(index) === cleanRoot + && index >= 0 + && (options.parseArrays && index <= options.arrayLimit) + ) { + obj = []; + obj[index] = leaf; + } else { + obj[cleanRoot] = leaf; + } } + + leaf = obj; } - return obj; + return leaf; }; var parseKeys = function parseQueryStringKeys(givenKey, val, options) { @@ -164,12 +170,13 @@ var parseKeys = function parseQueryStringKeys(givenKey, val, options) { }; module.exports = function (str, opts) { - var options = opts || {}; + var options = opts ? utils.assign({}, opts) : {}; if (options.decoder !== null && options.decoder !== undefined && typeof options.decoder !== 'function') { throw new TypeError('Decoder has to be a function.'); } + options.ignoreQueryPrefix = options.ignoreQueryPrefix === true; options.delimiter = typeof options.delimiter === 'string' || utils.isRegExp(options.delimiter) ? options.delimiter : defaults.delimiter; options.depth = typeof options.depth === 'number' ? options.depth : defaults.depth; options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : defaults.arrayLimit; @@ -253,7 +260,7 @@ var stringify = function stringify( // eslint-disable-line func-name-matching obj = serializeDate(obj); } else if (obj === null) { if (strictNullHandling) { - return encoder && !encodeValuesOnly ? encoder(prefix) : prefix; + return encoder && !encodeValuesOnly ? encoder(prefix, defaults.encoder) : prefix; } obj = ''; @@ -261,8 +268,8 @@ var stringify = function stringify( // eslint-disable-line func-name-matching if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || utils.isBuffer(obj)) { if (encoder) { - var keyValue = encodeValuesOnly ? prefix : encoder(prefix); - return [formatter(keyValue) + '=' + formatter(encoder(obj))]; + var keyValue = encodeValuesOnly ? prefix : encoder(prefix, defaults.encoder); + return [formatter(keyValue) + '=' + formatter(encoder(obj, defaults.encoder))]; } return [formatter(prefix) + '=' + formatter(String(obj))]; } @@ -326,7 +333,7 @@ var stringify = function stringify( // eslint-disable-line func-name-matching module.exports = function (object, opts) { var obj = object; - var options = opts || {}; + var options = opts ? utils.assign({}, opts) : {}; if (options.encoder !== null && options.encoder !== undefined && typeof options.encoder !== 'function') { throw new TypeError('Encoder has to be a function.'); @@ -342,7 +349,7 @@ module.exports = function (object, opts) { var serializeDate = typeof options.serializeDate === 'function' ? options.serializeDate : defaults.serializeDate; var encodeValuesOnly = typeof options.encodeValuesOnly === 'boolean' ? options.encodeValuesOnly : defaults.encodeValuesOnly; if (typeof options.format === 'undefined') { - options.format = formats.default; + options.format = formats['default']; } else if (!Object.prototype.hasOwnProperty.call(formats.formatters, options.format)) { throw new TypeError('Unknown format option provided.'); } @@ -406,7 +413,10 @@ module.exports = function (object, opts) { )); } - return keys.join(delimiter); + var joined = keys.join(delimiter); + var prefix = options.addQueryPrefix === true ? '?' : ''; + + return joined.length > 0 ? prefix + joined : ''; }; },{"./formats":1,"./utils":5}],5:[function(require,module,exports){ @@ -423,7 +433,30 @@ var hexTable = (function () { return array; }()); -exports.arrayToObject = function (source, options) { +var compactQueue = function compactQueue(queue) { + var obj; + + while (queue.length) { + var item = queue.pop(); + obj = item.obj[item.prop]; + + if (Array.isArray(obj)) { + var compacted = []; + + for (var j = 0; j < obj.length; ++j) { + if (typeof obj[j] !== 'undefined') { + compacted.push(obj[j]); + } + } + + item.obj[item.prop] = compacted; + } + } + + return obj; +}; + +exports.arrayToObject = function arrayToObject(source, options) { var obj = options && options.plainObjects ? Object.create(null) : {}; for (var i = 0; i < source.length; ++i) { if (typeof source[i] !== 'undefined') { @@ -434,7 +467,7 @@ exports.arrayToObject = function (source, options) { return obj; }; -exports.merge = function (target, source, options) { +exports.merge = function merge(target, source, options) { if (!source) { return target; } @@ -480,7 +513,7 @@ exports.merge = function (target, source, options) { return Object.keys(source).reduce(function (acc, key) { var value = source[key]; - if (Object.prototype.hasOwnProperty.call(acc, key)) { + if (has.call(acc, key)) { acc[key] = exports.merge(acc[key], value, options); } else { acc[key] = value; @@ -489,6 +522,13 @@ exports.merge = function (target, source, options) { }, mergeTarget); }; +exports.assign = function assignSingleSource(target, source) { + return Object.keys(source).reduce(function (acc, key) { + acc[key] = source[key]; + return acc; + }, target); +}; + exports.decode = function (str) { try { return decodeURIComponent(str.replace(/\+/g, ' ')); @@ -497,7 +537,7 @@ exports.decode = function (str) { } }; -exports.encode = function (str) { +exports.encode = function encode(str) { // This code was originally written by Brian White (mscdex) for the io.js core querystring library. // It has been adapted here for stricter adherence to RFC 3986 if (str.length === 0) { @@ -511,13 +551,13 @@ exports.encode = function (str) { var c = string.charCodeAt(i); if ( - c === 0x2D || // - - c === 0x2E || // . - c === 0x5F || // _ - c === 0x7E || // ~ - (c >= 0x30 && c <= 0x39) || // 0-9 - (c >= 0x41 && c <= 0x5A) || // a-z - (c >= 0x61 && c <= 0x7A) // A-Z + c === 0x2D // - + || c === 0x2E // . + || c === 0x5F // _ + || c === 0x7E // ~ + || (c >= 0x30 && c <= 0x39) // 0-9 + || (c >= 0x41 && c <= 0x5A) // a-z + || (c >= 0x61 && c <= 0x7A) // A-Z ) { out += string.charAt(i); continue; @@ -540,52 +580,42 @@ exports.encode = function (str) { i += 1; c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF)); - out += hexTable[0xF0 | (c >> 18)] + hexTable[0x80 | ((c >> 12) & 0x3F)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)]; // eslint-disable-line max-len + out += hexTable[0xF0 | (c >> 18)] + + hexTable[0x80 | ((c >> 12) & 0x3F)] + + hexTable[0x80 | ((c >> 6) & 0x3F)] + + hexTable[0x80 | (c & 0x3F)]; } return out; }; -exports.compact = function (obj, references) { - if (typeof obj !== 'object' || obj === null) { - return obj; - } - - var refs = references || []; - var lookup = refs.indexOf(obj); - if (lookup !== -1) { - return refs[lookup]; - } - - refs.push(obj); +exports.compact = function compact(value) { + var queue = [{ obj: { o: value }, prop: 'o' }]; + var refs = []; - if (Array.isArray(obj)) { - var compacted = []; + for (var i = 0; i < queue.length; ++i) { + var item = queue[i]; + var obj = item.obj[item.prop]; - for (var i = 0; i < obj.length; ++i) { - if (obj[i] && typeof obj[i] === 'object') { - compacted.push(exports.compact(obj[i], refs)); - } else if (typeof obj[i] !== 'undefined') { - compacted.push(obj[i]); + var keys = Object.keys(obj); + for (var j = 0; j < keys.length; ++j) { + var key = keys[j]; + var val = obj[key]; + if (typeof val === 'object' && val !== null && refs.indexOf(val) === -1) { + queue.push({ obj: obj, prop: key }); + refs.push(val); } } - - return compacted; } - var keys = Object.keys(obj); - keys.forEach(function (key) { - obj[key] = exports.compact(obj[key], refs); - }); - - return obj; + return compactQueue(queue); }; -exports.isRegExp = function (obj) { +exports.isRegExp = function isRegExp(obj) { return Object.prototype.toString.call(obj) === '[object RegExp]'; }; -exports.isBuffer = function (obj) { +exports.isBuffer = function isBuffer(obj) { if (obj === null || typeof obj === 'undefined') { return false; } diff --git a/nodejs/node_modules/qs/lib/parse.js b/nodejs/node_modules/qs/lib/parse.js index 1307e9d79..8c9872ecc 100644 --- a/nodejs/node_modules/qs/lib/parse.js +++ b/nodejs/node_modules/qs/lib/parse.js @@ -18,19 +18,23 @@ var defaults = { var parseValues = function parseQueryStringValues(str, options) { var obj = {}; - var parts = str.split(options.delimiter, options.parameterLimit === Infinity ? undefined : options.parameterLimit); + var cleanStr = options.ignoreQueryPrefix ? str.replace(/^\?/, '') : str; + var limit = options.parameterLimit === Infinity ? undefined : options.parameterLimit; + var parts = cleanStr.split(options.delimiter, limit); for (var i = 0; i < parts.length; ++i) { var part = parts[i]; - var pos = part.indexOf(']=') === -1 ? part.indexOf('=') : part.indexOf(']=') + 1; + + var bracketEqualsPos = part.indexOf(']='); + var pos = bracketEqualsPos === -1 ? part.indexOf('=') : bracketEqualsPos + 1; var key, val; if (pos === -1) { - key = options.decoder(part); + key = options.decoder(part, defaults.decoder); val = options.strictNullHandling ? null : ''; } else { - key = options.decoder(part.slice(0, pos)); - val = options.decoder(part.slice(pos + 1)); + key = options.decoder(part.slice(0, pos), defaults.decoder); + val = options.decoder(part.slice(pos + 1), defaults.decoder); } if (has.call(obj, key)) { obj[key] = [].concat(obj[key]).concat(val); @@ -42,36 +46,38 @@ var parseValues = function parseQueryStringValues(str, options) { return obj; }; -var parseObject = function parseObjectRecursive(chain, val, options) { - if (!chain.length) { - return val; - } +var parseObject = function (chain, val, options) { + var leaf = val; + + for (var i = chain.length - 1; i >= 0; --i) { + var obj; + var root = chain[i]; - var root = chain.shift(); - - var obj; - if (root === '[]') { - obj = []; - obj = obj.concat(parseObject(chain, val, options)); - } else { - obj = options.plainObjects ? Object.create(null) : {}; - var cleanRoot = root.charAt(0) === '[' && root.charAt(root.length - 1) === ']' ? root.slice(1, -1) : root; - var index = parseInt(cleanRoot, 10); - if ( - !isNaN(index) && - root !== cleanRoot && - String(index) === cleanRoot && - index >= 0 && - (options.parseArrays && index <= options.arrayLimit) - ) { + if (root === '[]') { obj = []; - obj[index] = parseObject(chain, val, options); + obj = obj.concat(leaf); } else { - obj[cleanRoot] = parseObject(chain, val, options); + obj = options.plainObjects ? Object.create(null) : {}; + var cleanRoot = root.charAt(0) === '[' && root.charAt(root.length - 1) === ']' ? root.slice(1, -1) : root; + var index = parseInt(cleanRoot, 10); + if ( + !isNaN(index) + && root !== cleanRoot + && String(index) === cleanRoot + && index >= 0 + && (options.parseArrays && index <= options.arrayLimit) + ) { + obj = []; + obj[index] = leaf; + } else { + obj[cleanRoot] = leaf; + } } + + leaf = obj; } - return obj; + return leaf; }; var parseKeys = function parseQueryStringKeys(givenKey, val, options) { @@ -130,12 +136,13 @@ var parseKeys = function parseQueryStringKeys(givenKey, val, options) { }; module.exports = function (str, opts) { - var options = opts || {}; + var options = opts ? utils.assign({}, opts) : {}; if (options.decoder !== null && options.decoder !== undefined && typeof options.decoder !== 'function') { throw new TypeError('Decoder has to be a function.'); } + options.ignoreQueryPrefix = options.ignoreQueryPrefix === true; options.delimiter = typeof options.delimiter === 'string' || utils.isRegExp(options.delimiter) ? options.delimiter : defaults.delimiter; options.depth = typeof options.depth === 'number' ? options.depth : defaults.depth; options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : defaults.arrayLimit; diff --git a/nodejs/node_modules/qs/lib/stringify.js b/nodejs/node_modules/qs/lib/stringify.js index 7694988c0..ab915ac46 100644 --- a/nodejs/node_modules/qs/lib/stringify.js +++ b/nodejs/node_modules/qs/lib/stringify.js @@ -50,7 +50,7 @@ var stringify = function stringify( // eslint-disable-line func-name-matching obj = serializeDate(obj); } else if (obj === null) { if (strictNullHandling) { - return encoder && !encodeValuesOnly ? encoder(prefix) : prefix; + return encoder && !encodeValuesOnly ? encoder(prefix, defaults.encoder) : prefix; } obj = ''; @@ -58,8 +58,8 @@ var stringify = function stringify( // eslint-disable-line func-name-matching if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || utils.isBuffer(obj)) { if (encoder) { - var keyValue = encodeValuesOnly ? prefix : encoder(prefix); - return [formatter(keyValue) + '=' + formatter(encoder(obj))]; + var keyValue = encodeValuesOnly ? prefix : encoder(prefix, defaults.encoder); + return [formatter(keyValue) + '=' + formatter(encoder(obj, defaults.encoder))]; } return [formatter(prefix) + '=' + formatter(String(obj))]; } @@ -123,7 +123,7 @@ var stringify = function stringify( // eslint-disable-line func-name-matching module.exports = function (object, opts) { var obj = object; - var options = opts || {}; + var options = opts ? utils.assign({}, opts) : {}; if (options.encoder !== null && options.encoder !== undefined && typeof options.encoder !== 'function') { throw new TypeError('Encoder has to be a function.'); @@ -139,7 +139,7 @@ module.exports = function (object, opts) { var serializeDate = typeof options.serializeDate === 'function' ? options.serializeDate : defaults.serializeDate; var encodeValuesOnly = typeof options.encodeValuesOnly === 'boolean' ? options.encodeValuesOnly : defaults.encodeValuesOnly; if (typeof options.format === 'undefined') { - options.format = formats.default; + options.format = formats['default']; } else if (!Object.prototype.hasOwnProperty.call(formats.formatters, options.format)) { throw new TypeError('Unknown format option provided.'); } @@ -203,5 +203,8 @@ module.exports = function (object, opts) { )); } - return keys.join(delimiter); + var joined = keys.join(delimiter); + var prefix = options.addQueryPrefix === true ? '?' : ''; + + return joined.length > 0 ? prefix + joined : ''; }; diff --git a/nodejs/node_modules/qs/lib/utils.js b/nodejs/node_modules/qs/lib/utils.js index b21433237..06cae2f09 100644 --- a/nodejs/node_modules/qs/lib/utils.js +++ b/nodejs/node_modules/qs/lib/utils.js @@ -11,7 +11,30 @@ var hexTable = (function () { return array; }()); -exports.arrayToObject = function (source, options) { +var compactQueue = function compactQueue(queue) { + var obj; + + while (queue.length) { + var item = queue.pop(); + obj = item.obj[item.prop]; + + if (Array.isArray(obj)) { + var compacted = []; + + for (var j = 0; j < obj.length; ++j) { + if (typeof obj[j] !== 'undefined') { + compacted.push(obj[j]); + } + } + + item.obj[item.prop] = compacted; + } + } + + return obj; +}; + +exports.arrayToObject = function arrayToObject(source, options) { var obj = options && options.plainObjects ? Object.create(null) : {}; for (var i = 0; i < source.length; ++i) { if (typeof source[i] !== 'undefined') { @@ -22,7 +45,7 @@ exports.arrayToObject = function (source, options) { return obj; }; -exports.merge = function (target, source, options) { +exports.merge = function merge(target, source, options) { if (!source) { return target; } @@ -68,7 +91,7 @@ exports.merge = function (target, source, options) { return Object.keys(source).reduce(function (acc, key) { var value = source[key]; - if (Object.prototype.hasOwnProperty.call(acc, key)) { + if (has.call(acc, key)) { acc[key] = exports.merge(acc[key], value, options); } else { acc[key] = value; @@ -77,6 +100,13 @@ exports.merge = function (target, source, options) { }, mergeTarget); }; +exports.assign = function assignSingleSource(target, source) { + return Object.keys(source).reduce(function (acc, key) { + acc[key] = source[key]; + return acc; + }, target); +}; + exports.decode = function (str) { try { return decodeURIComponent(str.replace(/\+/g, ' ')); @@ -85,7 +115,7 @@ exports.decode = function (str) { } }; -exports.encode = function (str) { +exports.encode = function encode(str) { // This code was originally written by Brian White (mscdex) for the io.js core querystring library. // It has been adapted here for stricter adherence to RFC 3986 if (str.length === 0) { @@ -99,13 +129,13 @@ exports.encode = function (str) { var c = string.charCodeAt(i); if ( - c === 0x2D || // - - c === 0x2E || // . - c === 0x5F || // _ - c === 0x7E || // ~ - (c >= 0x30 && c <= 0x39) || // 0-9 - (c >= 0x41 && c <= 0x5A) || // a-z - (c >= 0x61 && c <= 0x7A) // A-Z + c === 0x2D // - + || c === 0x2E // . + || c === 0x5F // _ + || c === 0x7E // ~ + || (c >= 0x30 && c <= 0x39) // 0-9 + || (c >= 0x41 && c <= 0x5A) // a-z + || (c >= 0x61 && c <= 0x7A) // A-Z ) { out += string.charAt(i); continue; @@ -128,52 +158,42 @@ exports.encode = function (str) { i += 1; c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF)); - out += hexTable[0xF0 | (c >> 18)] + hexTable[0x80 | ((c >> 12) & 0x3F)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)]; // eslint-disable-line max-len + out += hexTable[0xF0 | (c >> 18)] + + hexTable[0x80 | ((c >> 12) & 0x3F)] + + hexTable[0x80 | ((c >> 6) & 0x3F)] + + hexTable[0x80 | (c & 0x3F)]; } return out; }; -exports.compact = function (obj, references) { - if (typeof obj !== 'object' || obj === null) { - return obj; - } - - var refs = references || []; - var lookup = refs.indexOf(obj); - if (lookup !== -1) { - return refs[lookup]; - } - - refs.push(obj); - - if (Array.isArray(obj)) { - var compacted = []; - - for (var i = 0; i < obj.length; ++i) { - if (obj[i] && typeof obj[i] === 'object') { - compacted.push(exports.compact(obj[i], refs)); - } else if (typeof obj[i] !== 'undefined') { - compacted.push(obj[i]); +exports.compact = function compact(value) { + var queue = [{ obj: { o: value }, prop: 'o' }]; + var refs = []; + + for (var i = 0; i < queue.length; ++i) { + var item = queue[i]; + var obj = item.obj[item.prop]; + + var keys = Object.keys(obj); + for (var j = 0; j < keys.length; ++j) { + var key = keys[j]; + var val = obj[key]; + if (typeof val === 'object' && val !== null && refs.indexOf(val) === -1) { + queue.push({ obj: obj, prop: key }); + refs.push(val); } } - - return compacted; } - var keys = Object.keys(obj); - keys.forEach(function (key) { - obj[key] = exports.compact(obj[key], refs); - }); - - return obj; + return compactQueue(queue); }; -exports.isRegExp = function (obj) { +exports.isRegExp = function isRegExp(obj) { return Object.prototype.toString.call(obj) === '[object RegExp]'; }; -exports.isBuffer = function (obj) { +exports.isBuffer = function isBuffer(obj) { if (obj === null || typeof obj === 'undefined') { return false; } diff --git a/nodejs/node_modules/qs/package.json b/nodejs/node_modules/qs/package.json index 4a1863185..635153408 100644 --- a/nodejs/node_modules/qs/package.json +++ b/nodejs/node_modules/qs/package.json @@ -1,50 +1,33 @@ { "_args": [ [ - { - "raw": "qs@6.4.0", - "scope": null, - "escapedName": "qs", - "name": "qs", - "rawSpec": "6.4.0", - "spec": "6.4.0", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "qs@6.5.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "qs@6.4.0", - "_id": "qs@6.4.0", - "_inCache": true, + "_from": "qs@6.5.1", + "_id": "qs@6.5.1", + "_inBundle": false, + "_integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", "_location": "/qs", - "_nodeVersion": "7.7.1", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/qs-6.4.0.tgz_1488783808282_0.7979955193586648" - }, - "_npmUser": { - "name": "ljharb", - "email": "ljharb@gmail.com" - }, - "_npmVersion": "4.1.2", "_phantomChildren": {}, "_requested": { - "raw": "qs@6.4.0", - "scope": null, - "escapedName": "qs", + "type": "version", + "registry": true, + "raw": "qs@6.5.1", "name": "qs", - "rawSpec": "6.4.0", - "spec": "6.4.0", - "type": "version" + "escapedName": "qs", + "rawSpec": "6.5.1", + "saveSpec": null, + "fetchSpec": "6.5.1" }, "_requiredBy": [ + "/body-parser", "/express" ], - "_resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "_shasum": "13e26d28ad6b0ffaa91312cd3bf708ed351e7233", - "_shrinkwrap": null, - "_spec": "qs@6.4.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "_spec": "6.5.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/ljharb/qs/issues" }, @@ -58,27 +41,21 @@ "dependencies": {}, "description": "A querystring parser that supports nesting and arrays, with a depth limit", "devDependencies": { - "@ljharb/eslint-config": "^11.0.0", - "browserify": "^14.1.0", + "@ljharb/eslint-config": "^12.2.1", + "browserify": "^14.4.0", "covert": "^1.1.0", - "eslint": "^3.17.0", + "editorconfig-tools": "^0.1.1", + "eslint": "^4.6.1", "evalmd": "^0.0.17", - "iconv-lite": "^0.4.15", + "iconv-lite": "^0.4.18", "mkdirp": "^0.5.1", - "parallelshell": "^2.0.0", "qs-iconv": "^1.0.4", "safe-publish-latest": "^1.1.1", - "tape": "^4.6.3" - }, - "directories": {}, - "dist": { - "shasum": "13e26d28ad6b0ffaa91312cd3bf708ed351e7233", - "tarball": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz" + "tape": "^4.8.0" }, "engines": { "node": ">=0.6" }, - "gitHead": "c7f87b8d2eedd377f6ace065655201f51bee6334", "homepage": "https://github.com/ljharb/qs", "keywords": [ "querystring", @@ -86,23 +63,7 @@ ], "license": "BSD-3-Clause", "main": "lib/index.js", - "maintainers": [ - { - "name": "hueniverse", - "email": "eran@hammer.io" - }, - { - "name": "ljharb", - "email": "ljharb@gmail.com" - }, - { - "name": "nlf", - "email": "quitlahok@gmail.com" - } - ], "name": "qs", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/ljharb/qs.git" @@ -111,11 +72,12 @@ "coverage": "covert test", "dist": "mkdirp dist && browserify --standalone Qs lib/index.js > dist/qs.js", "lint": "eslint lib/*.js test/*.js", + "prelint": "editorconfig-tools check * lib/* test/*", "prepublish": "safe-publish-latest && npm run dist", "pretest": "npm run --silent readme && npm run --silent lint", "readme": "evalmd README.md", "test": "npm run --silent coverage", "tests-only": "node test" }, - "version": "6.4.0" + "version": "6.5.1" } diff --git a/nodejs/node_modules/qs/test/.eslintrc b/nodejs/node_modules/qs/test/.eslintrc index c4f52d029..20175d64d 100644 --- a/nodejs/node_modules/qs/test/.eslintrc +++ b/nodejs/node_modules/qs/test/.eslintrc @@ -1,11 +1,15 @@ { "rules": { + "array-bracket-newline": 0, + "array-element-newline": 0, "consistent-return": 2, "max-lines": 0, "max-nested-callbacks": [2, 3], "max-statements": 0, + "no-buffer-constructor": 0, "no-extend-native": 0, "no-magic-numbers": 0, + "object-curly-newline": 0, "sort-keys": 0 } } diff --git a/nodejs/node_modules/qs/test/parse.js b/nodejs/node_modules/qs/test/parse.js index e451e91fe..d7d864192 100644 --- a/nodejs/node_modules/qs/test/parse.js +++ b/nodejs/node_modules/qs/test/parse.js @@ -2,6 +2,7 @@ var test = require('tape'); var qs = require('../'); +var utils = require('../lib/utils'); var iconv = require('iconv-lite'); test('parse()', function (t) { @@ -304,6 +305,13 @@ test('parse()', function (t) { st.end(); }); + t.test('allows for query string prefix', function (st) { + st.deepEqual(qs.parse('?foo=bar', { ignoreQueryPrefix: true }), { foo: 'bar' }); + st.deepEqual(qs.parse('foo=bar', { ignoreQueryPrefix: true }), { foo: 'bar' }); + st.deepEqual(qs.parse('?foo=bar', { ignoreQueryPrefix: false }), { '?foo': 'bar' }); + st.end(); + }); + t.test('parses an object', function (st) { var input = { 'user[name]': { 'pop[bob]': 3 }, @@ -388,6 +396,33 @@ test('parse()', function (t) { st.end(); }); + t.test('does not crash when parsing deep objects', function (st) { + var parsed; + var str = 'foo'; + + for (var i = 0; i < 5000; i++) { + str += '[p]'; + } + + str += '=bar'; + + st.doesNotThrow(function () { + parsed = qs.parse(str, { depth: 5000 }); + }); + + st.equal('foo' in parsed, true, 'parsed has "foo" property'); + + var depth = 0; + var ref = parsed.foo; + while ((ref = ref.p)) { + depth += 1; + } + + st.equal(depth, 5000, 'parsed is 5000 properties deep'); + + st.end(); + }); + t.test('parses null objects correctly', { skip: !Object.create }, function (st) { var a = Object.create(null); a.b = 'c'; @@ -510,10 +545,29 @@ test('parse()', function (t) { st.end(); }); + t.test('receives the default decoder as a second argument', function (st) { + st.plan(1); + qs.parse('a', { + decoder: function (str, defaultDecoder) { + st.equal(defaultDecoder, utils.decode); + } + }); + st.end(); + }); + t.test('throws error with wrong decoder', function (st) { - st.throws(function () { + st['throws'](function () { qs.parse({}, { decoder: 'string' }); }, new TypeError('Decoder has to be a function.')); st.end(); }); + + t.test('does not mutate the options argument', function (st) { + var options = {}; + qs.parse('a[b]=true', options); + st.deepEqual(options, {}); + st.end(); + }); + + t.end(); }); diff --git a/nodejs/node_modules/qs/test/stringify.js b/nodejs/node_modules/qs/test/stringify.js index 711dae507..124a99dca 100644 --- a/nodejs/node_modules/qs/test/stringify.js +++ b/nodejs/node_modules/qs/test/stringify.js @@ -2,6 +2,7 @@ var test = require('tape'); var qs = require('../'); +var utils = require('../lib/utils'); var iconv = require('iconv-lite'); test('stringify()', function (t) { @@ -17,6 +18,16 @@ test('stringify()', function (t) { st.end(); }); + t.test('adds query prefix', function (st) { + st.equal(qs.stringify({ a: 'b' }, { addQueryPrefix: true }), '?a=b'); + st.end(); + }); + + t.test('with query prefix, outputs blank string given an empty object', function (st) { + st.equal(qs.stringify({}, { addQueryPrefix: true }), ''); + st.end(); + }); + t.test('stringifies a nested object', function (st) { st.equal(qs.stringify({ a: { b: 'c' } }), 'a%5Bb%5D=c'); st.equal(qs.stringify({ a: { b: { c: { d: 'e' } } } }), 'a%5Bb%5D%5Bc%5D%5Bd%5D=e'); @@ -452,8 +463,18 @@ test('stringify()', function (t) { st.end(); }); + t.test('receives the default encoder as a second argument', function (st) { + st.plan(2); + qs.stringify({ a: 1 }, { + encoder: function (str, defaultEncoder) { + st.equal(defaultEncoder, utils.encode); + } + }); + st.end(); + }); + t.test('throws error with wrong encoder', function (st) { - st.throws(function () { + st['throws'](function () { qs.stringify({}, { encoder: 'string' }); }, new TypeError('Encoder has to be a function.')); st.end(); @@ -483,7 +504,7 @@ test('stringify()', function (t) { mutatedDate.toISOString = function () { throw new SyntaxError(); }; - st.throws(function () { + st['throws'](function () { mutatedDate.toISOString(); }, SyntaxError); st.equal( @@ -525,7 +546,7 @@ test('stringify()', function (t) { t.test('Edge cases and unknown formats', function (st) { ['UFO1234', false, 1234, null, {}, []].forEach( function (format) { - st.throws( + st['throws']( function () { qs.stringify({ a: 'b c' }, { format: format }); }, @@ -564,4 +585,12 @@ test('stringify()', function (t) { st.end(); }); + t.test('does not mutate the options argument', function (st) { + var options = {}; + qs.stringify({}, options); + st.deepEqual(options, {}); + st.end(); + }); + + t.end(); }); diff --git a/nodejs/node_modules/qs/test/utils.js b/nodejs/node_modules/qs/test/utils.js index 0721dd8ec..eff4011a4 100644 --- a/nodejs/node_modules/qs/test/utils.js +++ b/nodejs/node_modules/qs/test/utils.js @@ -20,3 +20,15 @@ test('merge()', function (t) { t.end(); }); + +test('assign()', function (t) { + var target = { a: 1, b: 2 }; + var source = { b: 3, c: 4 }; + var result = utils.assign(target, source); + + t.equal(result, target, 'returns the target'); + t.deepEqual(target, { a: 1, b: 3, c: 4 }, 'target and source are merged'); + t.deepEqual(source, { b: 3, c: 4 }, 'source is untouched'); + + t.end(); +}); diff --git a/nodejs/node_modules/range-parser/package.json b/nodejs/node_modules/range-parser/package.json index 955b68eae..9fea6c867 100644 --- a/nodejs/node_modules/range-parser/package.json +++ b/nodejs/node_modules/range-parser/package.json @@ -1,50 +1,33 @@ { "_args": [ [ - { - "raw": "range-parser@~1.2.0", - "scope": null, - "escapedName": "range-parser", - "name": "range-parser", - "rawSpec": "~1.2.0", - "spec": ">=1.2.0 <1.3.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "range-parser@1.2.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "range-parser@>=1.2.0 <1.3.0", + "_from": "range-parser@1.2.0", "_id": "range-parser@1.2.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", "_location": "/range-parser", - "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/range-parser-1.2.0.tgz_1464803293097_0.6830497414339334" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "range-parser@~1.2.0", - "scope": null, - "escapedName": "range-parser", + "type": "version", + "registry": true, + "raw": "range-parser@1.2.0", "name": "range-parser", - "rawSpec": "~1.2.0", - "spec": ">=1.2.0 <1.3.0", - "type": "range" + "escapedName": "range-parser", + "rawSpec": "1.2.0", + "saveSpec": null, + "fetchSpec": "1.2.0" }, "_requiredBy": [ "/express", "/send" ], "_resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "_shasum": "f49be6b487894ddc40dcc94a322f611092e00d5e", - "_shrinkwrap": null, - "_spec": "range-parser@~1.2.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.2.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca", @@ -68,7 +51,6 @@ "url": "http://jongleberry.com" } ], - "dependencies": {}, "description": "Range header field string parser", "devDependencies": { "eslint": "2.11.1", @@ -78,11 +60,6 @@ "istanbul": "0.4.3", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "f49be6b487894ddc40dcc94a322f611092e00d5e", - "tarball": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -91,35 +68,14 @@ "LICENSE", "index.js" ], - "gitHead": "0665aca31639d799dee1d35fb10970799559ec48", - "homepage": "https://github.com/jshttp/range-parser", + "homepage": "https://github.com/jshttp/range-parser#readme", "keywords": [ "range", "parser", "http" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "jonathanong", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "tjholowaychuk", - "email": "tj@vision-media.ca" - } - ], "name": "range-parser", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/range-parser.git" diff --git a/nodejs/node_modules/raw-body/HISTORY.md b/nodejs/node_modules/raw-body/HISTORY.md new file mode 100644 index 000000000..9f1961f81 --- /dev/null +++ b/nodejs/node_modules/raw-body/HISTORY.md @@ -0,0 +1,247 @@ +2.3.2 / 2017-09-09 +================== + + * deps: iconv-lite@0.4.19 + - Fix ISO-8859-1regression + - Update Windows-1255 + +2.3.1 / 2017-09-07 +================== + + * deps: bytes@3.0.0 + * deps: http-errors@1.6.2 + - deps: depd@1.1.1 + * perf: skip buffer decoding on overage chunk + +2.3.0 / 2017-08-04 +================== + + * Add TypeScript definitions + * Use `http-errors` for standard emitted errors + * deps: bytes@2.5.0 + * deps: iconv-lite@0.4.18 + - Add support for React Native + - Add a warning if not loaded as utf-8 + - Fix CESU-8 decoding in Node.js 8 + - Improve speed of ISO-8859-1 encoding + +2.2.0 / 2017-01-02 +================== + + * deps: iconv-lite@0.4.15 + - Added encoding MS-31J + - Added encoding MS-932 + - Added encoding MS-936 + - Added encoding MS-949 + - Added encoding MS-950 + - Fix GBK/GB18030 handling of Euro character + +2.1.7 / 2016-06-19 +================== + + * deps: bytes@2.4.0 + * perf: remove double-cleanup on happy path + +2.1.6 / 2016-03-07 +================== + + * deps: bytes@2.3.0 + - Drop partial bytes on all parsed units + - Fix parsing byte string that looks like hex + +2.1.5 / 2015-11-30 +================== + + * deps: bytes@2.2.0 + * deps: iconv-lite@0.4.13 + +2.1.4 / 2015-09-27 +================== + + * Fix masking critical errors from `iconv-lite` + * deps: iconv-lite@0.4.12 + - Fix CESU-8 decoding in Node.js 4.x + +2.1.3 / 2015-09-12 +================== + + * Fix sync callback when attaching data listener causes sync read + - Node.js 0.10 compatibility issue + +2.1.2 / 2015-07-05 +================== + + * Fix error stack traces to skip `makeError` + * deps: iconv-lite@0.4.11 + - Add encoding CESU-8 + +2.1.1 / 2015-06-14 +================== + + * Use `unpipe` module for unpiping requests + +2.1.0 / 2015-05-28 +================== + + * deps: iconv-lite@0.4.10 + - Improved UTF-16 endianness detection + - Leading BOM is now removed when decoding + - The encoding UTF-16 without BOM now defaults to UTF-16LE when detection fails + +2.0.2 / 2015-05-21 +================== + + * deps: bytes@2.1.0 + - Slight optimizations + +2.0.1 / 2015-05-10 +================== + + * Fix a false-positive when unpiping in Node.js 0.8 + +2.0.0 / 2015-05-08 +================== + + * Return a promise without callback instead of thunk + * deps: bytes@2.0.1 + - units no longer case sensitive when parsing + +1.3.4 / 2015-04-15 +================== + + * Fix hanging callback if request aborts during read + * deps: iconv-lite@0.4.8 + - Add encoding alias UNICODE-1-1-UTF-7 + +1.3.3 / 2015-02-08 +================== + + * deps: iconv-lite@0.4.7 + - Gracefully support enumerables on `Object.prototype` + +1.3.2 / 2015-01-20 +================== + + * deps: iconv-lite@0.4.6 + - Fix rare aliases of single-byte encodings + +1.3.1 / 2014-11-21 +================== + + * deps: iconv-lite@0.4.5 + - Fix Windows-31J and X-SJIS encoding support + +1.3.0 / 2014-07-20 +================== + + * Fully unpipe the stream on error + - Fixes `Cannot switch to old mode now` error on Node.js 0.10+ + +1.2.3 / 2014-07-20 +================== + + * deps: iconv-lite@0.4.4 + - Added encoding UTF-7 + +1.2.2 / 2014-06-19 +================== + + * Send invalid encoding error to callback + +1.2.1 / 2014-06-15 +================== + + * deps: iconv-lite@0.4.3 + - Added encodings UTF-16BE and UTF-16 with BOM + +1.2.0 / 2014-06-13 +================== + + * Passing string as `options` interpreted as encoding + * Support all encodings from `iconv-lite` + +1.1.7 / 2014-06-12 +================== + + * use `string_decoder` module from npm + +1.1.6 / 2014-05-27 +================== + + * check encoding for old streams1 + * support node.js < 0.10.6 + +1.1.5 / 2014-05-14 +================== + + * bump bytes + +1.1.4 / 2014-04-19 +================== + + * allow true as an option + * bump bytes + +1.1.3 / 2014-03-02 +================== + + * fix case when length=null + +1.1.2 / 2013-12-01 +================== + + * be less strict on state.encoding check + +1.1.1 / 2013-11-27 +================== + + * add engines + +1.1.0 / 2013-11-27 +================== + + * add err.statusCode and err.type + * allow for encoding option to be true + * pause the stream instead of dumping on error + * throw if the stream's encoding is set + +1.0.1 / 2013-11-19 +================== + + * dont support streams1, throw if dev set encoding + +1.0.0 / 2013-11-17 +================== + + * rename `expected` option to `length` + +0.2.0 / 2013-11-15 +================== + + * republish + +0.1.1 / 2013-11-15 +================== + + * use bytes + +0.1.0 / 2013-11-11 +================== + + * generator support + +0.0.3 / 2013-10-10 +================== + + * update repo + +0.0.2 / 2013-09-14 +================== + + * dump stream on bad headers + * listen to events after defining received and buffers + +0.0.1 / 2013-09-14 +================== + + * Initial release diff --git a/nodejs/node_modules/express/node_modules/ms/LICENSE.md b/nodejs/node_modules/raw-body/LICENSE similarity index 81% rename from nodejs/node_modules/express/node_modules/ms/LICENSE.md rename to nodejs/node_modules/raw-body/LICENSE index 69b61253a..d695c8fd6 100644 --- a/nodejs/node_modules/express/node_modules/ms/LICENSE.md +++ b/nodejs/node_modules/raw-body/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) 2016 Zeit, Inc. +Copyright (c) 2013-2014 Jonathan Ong +Copyright (c) 2014-2015 Douglas Christopher Wilson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +10,13 @@ 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 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/nodejs/node_modules/raw-body/README.md b/nodejs/node_modules/raw-body/README.md new file mode 100644 index 000000000..c4db8a6b7 --- /dev/null +++ b/nodejs/node_modules/raw-body/README.md @@ -0,0 +1,219 @@ +# raw-body + +[![NPM Version][npm-image]][npm-url] +[![NPM Downloads][downloads-image]][downloads-url] +[![Node.js Version][node-version-image]][node-version-url] +[![Build status][travis-image]][travis-url] +[![Test coverage][coveralls-image]][coveralls-url] + +Gets the entire buffer of a stream either as a `Buffer` or a string. +Validates the stream's length against an expected length and maximum limit. +Ideal for parsing request bodies. + +## Install + +This is a [Node.js](https://nodejs.org/en/) module available through the +[npm registry](https://www.npmjs.com/). Installation is done using the +[`npm install` command](https://docs.npmjs.com/getting-started/installing-npm-packages-locally): + +```sh +$ npm install raw-body +``` + +### TypeScript + +This module includes a [TypeScript](https://www.typescriptlang.org/) +declarition file to enable auto complete in compatible editors and type +information for TypeScript projects. This module depends on the Node.js +types, so install `@types/node`: + +```sh +$ npm install @types/node +``` + +## API + + + +```js +var getRawBody = require('raw-body') +``` + +### getRawBody(stream, [options], [callback]) + +**Returns a promise if no callback specified and global `Promise` exists.** + +Options: + +- `length` - The length of the stream. + If the contents of the stream do not add up to this length, + an `400` error code is returned. +- `limit` - The byte limit of the body. + This is the number of bytes or any string format supported by + [bytes](https://www.npmjs.com/package/bytes), + for example `1000`, `'500kb'` or `'3mb'`. + If the body ends up being larger than this limit, + a `413` error code is returned. +- `encoding` - The encoding to use to decode the body into a string. + By default, a `Buffer` instance will be returned when no encoding is specified. + Most likely, you want `utf-8`, so setting `encoding` to `true` will decode as `utf-8`. + You can use any type of encoding supported by [iconv-lite](https://www.npmjs.org/package/iconv-lite#readme). + +You can also pass a string in place of options to just specify the encoding. + +If an error occurs, the stream will be paused, everything unpiped, +and you are responsible for correctly disposing the stream. +For HTTP requests, no handling is required if you send a response. +For streams that use file descriptors, you should `stream.destroy()` or `stream.close()` to prevent leaks. + +## Errors + +This module creates errors depending on the error condition during reading. +The error may be an error from the underlying Node.js implementation, but is +otherwise an error created by this module, which has the following attributes: + + * `limit` - the limit in bytes + * `length` and `expected` - the expected length of the stream + * `received` - the received bytes + * `encoding` - the invalid encoding + * `status` and `statusCode` - the corresponding status code for the error + * `type` - the error type + +### Types + +The errors from this module have a `type` property which allows for the progamatic +determination of the type of error returned. + +#### encoding.unsupported + +This error will occur when the `encoding` option is specified, but the value does +not map to an encoding supported by the [iconv-lite](https://www.npmjs.org/package/iconv-lite#readme) +module. + +#### entity.too.large + +This error will occur when the `limit` option is specified, but the stream has +an entity that is larger. + +#### request.aborted + +This error will occur when the request stream is aborted by the client before +reading the body has finished. + +#### request.size.invalid + +This error will occur when the `length` option is specified, but the stream has +emitted more bytes. + +#### stream.encoding.set + +This error will occur when the given stream has an encoding set on it, making it +a decoded stream. The stream should not have an encoding set and is expected to +emit `Buffer` objects. + +## Examples + +### Simple Express example + +```js +var contentType = require('content-type') +var express = require('express') +var getRawBody = require('raw-body') + +var app = express() + +app.use(function (req, res, next) { + getRawBody(req, { + length: req.headers['content-length'], + limit: '1mb', + encoding: contentType.parse(req).parameters.charset + }, function (err, string) { + if (err) return next(err) + req.text = string + next() + }) +}) + +// now access req.text +``` + +### Simple Koa example + +```js +var contentType = require('content-type') +var getRawBody = require('raw-body') +var koa = require('koa') + +var app = koa() + +app.use(function * (next) { + this.text = yield getRawBody(this.req, { + length: this.req.headers['content-length'], + limit: '1mb', + encoding: contentType.parse(this.req).parameters.charset + }) + yield next +}) + +// now access this.text +``` + +### Using as a promise + +To use this library as a promise, simply omit the `callback` and a promise is +returned, provided that a global `Promise` is defined. + +```js +var getRawBody = require('raw-body') +var http = require('http') + +var server = http.createServer(function (req, res) { + getRawBody(req) + .then(function (buf) { + res.statusCode = 200 + res.end(buf.length + ' bytes submitted') + }) + .catch(function (err) { + res.statusCode = 500 + res.end(err.message) + }) +}) + +server.listen(3000) +``` + +### Using with TypeScript + +```ts +import * as getRawBody from 'raw-body'; +import * as http from 'http'; + +const server = http.createServer((req, res) => { + getRawBody(req) + .then((buf) => { + res.statusCode = 200; + res.end(buf.length + ' bytes submitted'); + }) + .catch((err) => { + res.statusCode = err.statusCode; + res.end(err.message); + }); +}); + +server.listen(3000); +``` + +## License + +[MIT](LICENSE) + +[npm-image]: https://img.shields.io/npm/v/raw-body.svg +[npm-url]: https://npmjs.org/package/raw-body +[node-version-image]: https://img.shields.io/node/v/raw-body.svg +[node-version-url]: https://nodejs.org/en/download/ +[travis-image]: https://img.shields.io/travis/stream-utils/raw-body/master.svg +[travis-url]: https://travis-ci.org/stream-utils/raw-body +[coveralls-image]: https://img.shields.io/coveralls/stream-utils/raw-body/master.svg +[coveralls-url]: https://coveralls.io/r/stream-utils/raw-body?branch=master +[downloads-image]: https://img.shields.io/npm/dm/raw-body.svg +[downloads-url]: https://npmjs.org/package/raw-body diff --git a/nodejs/node_modules/raw-body/index.d.ts b/nodejs/node_modules/raw-body/index.d.ts new file mode 100644 index 000000000..dcbbebd4c --- /dev/null +++ b/nodejs/node_modules/raw-body/index.d.ts @@ -0,0 +1,87 @@ +import { Readable } from 'stream'; + +declare namespace getRawBody { + export type Encoding = string | true; + + export interface Options { + /** + * The expected length of the stream. + */ + length?: number | string | null; + /** + * The byte limit of the body. This is the number of bytes or any string + * format supported by `bytes`, for example `1000`, `'500kb'` or `'3mb'`. + */ + limit?: number | string | null; + /** + * The encoding to use to decode the body into a string. By default, a + * `Buffer` instance will be returned when no encoding is specified. Most + * likely, you want `utf-8`, so setting encoding to `true` will decode as + * `utf-8`. You can use any type of encoding supported by `iconv-lite`. + */ + encoding?: Encoding | null; + } + + export interface RawBodyError extends Error { + /** + * The limit in bytes. + */ + limit?: number; + /** + * The expected length of the stream. + */ + length?: number; + expected?: number; + /** + * The received bytes. + */ + received?: number; + /** + * The encoding. + */ + encoding?: string; + /** + * The corresponding status code for the error. + */ + status: number; + statusCode: number; + /** + * The error type. + */ + type: string; + } +} + +/** + * Gets the entire buffer of a stream either as a `Buffer` or a string. + * Validates the stream's length against an expected length and maximum + * limit. Ideal for parsing request bodies. + */ +declare function getRawBody( + stream: Readable, + callback: (err: getRawBody.RawBodyError, body: Buffer) => void +): void; + +declare function getRawBody( + stream: Readable, + options: (getRawBody.Options & { encoding: getRawBody.Encoding }) | getRawBody.Encoding, + callback: (err: getRawBody.RawBodyError, body: string) => void +): void; + +declare function getRawBody( + stream: Readable, + options: getRawBody.Options, + callback: (err: getRawBody.RawBodyError, body: Buffer) => void +): void; + +declare function getRawBody( + stream: Readable, + options: (getRawBody.Options & { encoding: getRawBody.Encoding }) | getRawBody.Encoding +): Promise; + +declare function getRawBody( + stream: Readable, + options?: getRawBody.Options +): Promise; + +export = getRawBody; diff --git a/nodejs/node_modules/raw-body/index.js b/nodejs/node_modules/raw-body/index.js new file mode 100644 index 000000000..7fe818604 --- /dev/null +++ b/nodejs/node_modules/raw-body/index.js @@ -0,0 +1,286 @@ +/*! + * raw-body + * Copyright(c) 2013-2014 Jonathan Ong + * Copyright(c) 2014-2015 Douglas Christopher Wilson + * MIT Licensed + */ + +'use strict' + +/** + * Module dependencies. + * @private + */ + +var bytes = require('bytes') +var createError = require('http-errors') +var iconv = require('iconv-lite') +var unpipe = require('unpipe') + +/** + * Module exports. + * @public + */ + +module.exports = getRawBody + +/** + * Module variables. + * @private + */ + +var ICONV_ENCODING_MESSAGE_REGEXP = /^Encoding not recognized: / + +/** + * Get the decoder for a given encoding. + * + * @param {string} encoding + * @private + */ + +function getDecoder (encoding) { + if (!encoding) return null + + try { + return iconv.getDecoder(encoding) + } catch (e) { + // error getting decoder + if (!ICONV_ENCODING_MESSAGE_REGEXP.test(e.message)) throw e + + // the encoding was not found + throw createError(415, 'specified encoding unsupported', { + encoding: encoding, + type: 'encoding.unsupported' + }) + } +} + +/** + * Get the raw body of a stream (typically HTTP). + * + * @param {object} stream + * @param {object|string|function} [options] + * @param {function} [callback] + * @public + */ + +function getRawBody (stream, options, callback) { + var done = callback + var opts = options || {} + + if (options === true || typeof options === 'string') { + // short cut for encoding + opts = { + encoding: options + } + } + + if (typeof options === 'function') { + done = options + opts = {} + } + + // validate callback is a function, if provided + if (done !== undefined && typeof done !== 'function') { + throw new TypeError('argument callback must be a function') + } + + // require the callback without promises + if (!done && !global.Promise) { + throw new TypeError('argument callback is required') + } + + // get encoding + var encoding = opts.encoding !== true + ? opts.encoding + : 'utf-8' + + // convert the limit to an integer + var limit = bytes.parse(opts.limit) + + // convert the expected length to an integer + var length = opts.length != null && !isNaN(opts.length) + ? parseInt(opts.length, 10) + : null + + if (done) { + // classic callback style + return readStream(stream, encoding, length, limit, done) + } + + return new Promise(function executor (resolve, reject) { + readStream(stream, encoding, length, limit, function onRead (err, buf) { + if (err) return reject(err) + resolve(buf) + }) + }) +} + +/** + * Halt a stream. + * + * @param {Object} stream + * @private + */ + +function halt (stream) { + // unpipe everything from the stream + unpipe(stream) + + // pause stream + if (typeof stream.pause === 'function') { + stream.pause() + } +} + +/** + * Read the data from the stream. + * + * @param {object} stream + * @param {string} encoding + * @param {number} length + * @param {number} limit + * @param {function} callback + * @public + */ + +function readStream (stream, encoding, length, limit, callback) { + var complete = false + var sync = true + + // check the length and limit options. + // note: we intentionally leave the stream paused, + // so users should handle the stream themselves. + if (limit !== null && length !== null && length > limit) { + return done(createError(413, 'request entity too large', { + expected: length, + length: length, + limit: limit, + type: 'entity.too.large' + })) + } + + // streams1: assert request encoding is buffer. + // streams2+: assert the stream encoding is buffer. + // stream._decoder: streams1 + // state.encoding: streams2 + // state.decoder: streams2, specifically < 0.10.6 + var state = stream._readableState + if (stream._decoder || (state && (state.encoding || state.decoder))) { + // developer error + return done(createError(500, 'stream encoding should not be set', { + type: 'stream.encoding.set' + })) + } + + var received = 0 + var decoder + + try { + decoder = getDecoder(encoding) + } catch (err) { + return done(err) + } + + var buffer = decoder + ? '' + : [] + + // attach listeners + stream.on('aborted', onAborted) + stream.on('close', cleanup) + stream.on('data', onData) + stream.on('end', onEnd) + stream.on('error', onEnd) + + // mark sync section complete + sync = false + + function done () { + var args = new Array(arguments.length) + + // copy arguments + for (var i = 0; i < args.length; i++) { + args[i] = arguments[i] + } + + // mark complete + complete = true + + if (sync) { + process.nextTick(invokeCallback) + } else { + invokeCallback() + } + + function invokeCallback () { + cleanup() + + if (args[0]) { + // halt the stream on error + halt(stream) + } + + callback.apply(null, args) + } + } + + function onAborted () { + if (complete) return + + done(createError(400, 'request aborted', { + code: 'ECONNABORTED', + expected: length, + length: length, + received: received, + type: 'request.aborted' + })) + } + + function onData (chunk) { + if (complete) return + + received += chunk.length + + if (limit !== null && received > limit) { + done(createError(413, 'request entity too large', { + limit: limit, + received: received, + type: 'entity.too.large' + })) + } else if (decoder) { + buffer += decoder.write(chunk) + } else { + buffer.push(chunk) + } + } + + function onEnd (err) { + if (complete) return + if (err) return done(err) + + if (length !== null && received !== length) { + done(createError(400, 'request size did not match content length', { + expected: length, + length: length, + received: received, + type: 'request.size.invalid' + })) + } else { + var string = decoder + ? buffer + (decoder.end() || '') + : Buffer.concat(buffer) + done(null, string) + } + } + + function cleanup () { + buffer = null + + stream.removeListener('aborted', onAborted) + stream.removeListener('data', onData) + stream.removeListener('end', onEnd) + stream.removeListener('error', onEnd) + stream.removeListener('close', cleanup) + } +} diff --git a/nodejs/node_modules/raw-body/package.json b/nodejs/node_modules/raw-body/package.json new file mode 100644 index 000000000..84eb27a1e --- /dev/null +++ b/nodejs/node_modules/raw-body/package.json @@ -0,0 +1,93 @@ +{ + "_args": [ + [ + "raw-body@2.3.2", + "/Users/muammar/github/mkchromecast/nodejs" + ] + ], + "_from": "raw-body@2.3.2", + "_id": "raw-body@2.3.2", + "_inBundle": false, + "_integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "_location": "/raw-body", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "raw-body@2.3.2", + "name": "raw-body", + "escapedName": "raw-body", + "rawSpec": "2.3.2", + "saveSpec": null, + "fetchSpec": "2.3.2" + }, + "_requiredBy": [ + "/body-parser" + ], + "_resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", + "_spec": "2.3.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", + "author": { + "name": "Jonathan Ong", + "email": "me@jongleberry.com", + "url": "http://jongleberry.com" + }, + "bugs": { + "url": "https://github.com/stream-utils/raw-body/issues" + }, + "contributors": [ + { + "name": "Douglas Christopher Wilson", + "email": "doug@somethingdoug.com" + }, + { + "name": "Raynos", + "email": "raynos2@gmail.com" + } + ], + "dependencies": { + "bytes": "3.0.0", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "unpipe": "1.0.0" + }, + "description": "Get and validate the raw body of a readable stream.", + "devDependencies": { + "bluebird": "3.5.0", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", + "eslint-plugin-promise": "3.5.0", + "eslint-plugin-standard": "3.0.1", + "istanbul": "0.4.5", + "mocha": "2.5.3", + "readable-stream": "2.3.3", + "safe-buffer": "5.1.1" + }, + "engines": { + "node": ">= 0.8" + }, + "files": [ + "HISTORY.md", + "LICENSE", + "README.md", + "index.d.ts", + "index.js" + ], + "homepage": "https://github.com/stream-utils/raw-body#readme", + "license": "MIT", + "name": "raw-body", + "repository": { + "type": "git", + "url": "git+https://github.com/stream-utils/raw-body.git" + }, + "scripts": { + "lint": "eslint --plugin markdown --ext js,md .", + "test": "mocha --trace-deprecation --reporter spec --bail --check-leaks test/", + "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --trace-deprecation --reporter dot --check-leaks test/", + "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --trace-deprecation --reporter spec --check-leaks test/" + }, + "version": "2.3.2" +} diff --git a/nodejs/node_modules/readable-stream/package.json b/nodejs/node_modules/readable-stream/package.json index 431e3d8fc..f2b748e75 100644 --- a/nodejs/node_modules/readable-stream/package.json +++ b/nodejs/node_modules/readable-stream/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "readable-stream@^1.0.34", - "scope": null, - "escapedName": "readable-stream", - "name": "readable-stream", - "rawSpec": "^1.0.34", - "spec": ">=1.0.34 <2.0.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/lame" + "readable-stream@1.1.14", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "readable-stream@>=1.0.34 <2.0.0", + "_from": "readable-stream@1.1.14", "_id": "readable-stream@1.1.14", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "_location": "/readable-stream", - "_nodeVersion": "5.10.1", - "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/readable-stream-1.1.14.tgz_1460563293219_0.5682175166439265" - }, - "_npmUser": { - "name": "cwmma", - "email": "calvin.metcalf@gmail.com" - }, - "_npmVersion": "3.8.3", "_phantomChildren": {}, "_requested": { - "raw": "readable-stream@^1.0.34", - "scope": null, - "escapedName": "readable-stream", + "type": "version", + "registry": true, + "raw": "readable-stream@1.1.14", "name": "readable-stream", - "rawSpec": "^1.0.34", - "spec": ">=1.0.34 <2.0.0", - "type": "range" + "escapedName": "readable-stream", + "rawSpec": "1.1.14", + "saveSpec": null, + "fetchSpec": "1.1.14" }, "_requiredBy": [ "/lame" ], "_resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "_shasum": "7cf4c54ef648e3813084c636dd2079e166c081d9", - "_shrinkwrap": null, - "_spec": "readable-stream@^1.0.34", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/lame", + "_spec": "1.1.14", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -66,12 +48,6 @@ "devDependencies": { "tap": "~0.2.6" }, - "directories": {}, - "dist": { - "shasum": "7cf4c54ef648e3813084c636dd2079e166c081d9", - "tarball": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" - }, - "gitHead": "52550840cb1d6e8a98ef9a909a4bea360bc6f7da", "homepage": "https://github.com/isaacs/readable-stream#readme", "keywords": [ "readable", @@ -80,27 +56,7 @@ ], "license": "MIT", "main": "readable.js", - "maintainers": [ - { - "name": "isaacs", - "email": "isaacs@npmjs.com" - }, - { - "name": "tootallnate", - "email": "nathan@tootallnate.net" - }, - { - "name": "rvagg", - "email": "rod@vagg.org" - }, - { - "name": "cwmma", - "email": "calvin.metcalf@gmail.com" - } - ], "name": "readable-stream", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/isaacs/readable-stream.git" diff --git a/nodejs/node_modules/safe-buffer/.travis.yml b/nodejs/node_modules/safe-buffer/.travis.yml new file mode 100644 index 000000000..7b20f28cb --- /dev/null +++ b/nodejs/node_modules/safe-buffer/.travis.yml @@ -0,0 +1,7 @@ +language: node_js +node_js: + - 'node' + - '5' + - '4' + - '0.12' + - '0.10' diff --git a/nodejs/node_modules/send/node_modules/ms/LICENSE.md b/nodejs/node_modules/safe-buffer/LICENSE similarity index 88% rename from nodejs/node_modules/send/node_modules/ms/LICENSE.md rename to nodejs/node_modules/safe-buffer/LICENSE index 69b61253a..0c068ceec 100644 --- a/nodejs/node_modules/send/node_modules/ms/LICENSE.md +++ b/nodejs/node_modules/safe-buffer/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 Zeit, Inc. +Copyright (c) Feross Aboukhadijeh Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +9,13 @@ 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 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/nodejs/node_modules/safe-buffer/README.md b/nodejs/node_modules/safe-buffer/README.md new file mode 100644 index 000000000..e9a81afd0 --- /dev/null +++ b/nodejs/node_modules/safe-buffer/README.md @@ -0,0 +1,584 @@ +# safe-buffer [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url] + +[travis-image]: https://img.shields.io/travis/feross/safe-buffer/master.svg +[travis-url]: https://travis-ci.org/feross/safe-buffer +[npm-image]: https://img.shields.io/npm/v/safe-buffer.svg +[npm-url]: https://npmjs.org/package/safe-buffer +[downloads-image]: https://img.shields.io/npm/dm/safe-buffer.svg +[downloads-url]: https://npmjs.org/package/safe-buffer +[standard-image]: https://img.shields.io/badge/code_style-standard-brightgreen.svg +[standard-url]: https://standardjs.com + +#### Safer Node.js Buffer API + +**Use the new Node.js Buffer APIs (`Buffer.from`, `Buffer.alloc`, +`Buffer.allocUnsafe`, `Buffer.allocUnsafeSlow`) in all versions of Node.js.** + +**Uses the built-in implementation when available.** + +## install + +``` +npm install safe-buffer +``` + +## usage + +The goal of this package is to provide a safe replacement for the node.js `Buffer`. + +It's a drop-in replacement for `Buffer`. You can use it by adding one `require` line to +the top of your node.js modules: + +```js +var Buffer = require('safe-buffer').Buffer + +// Existing buffer code will continue to work without issues: + +new Buffer('hey', 'utf8') +new Buffer([1, 2, 3], 'utf8') +new Buffer(obj) +new Buffer(16) // create an uninitialized buffer (potentially unsafe) + +// But you can use these new explicit APIs to make clear what you want: + +Buffer.from('hey', 'utf8') // convert from many types to a Buffer +Buffer.alloc(16) // create a zero-filled buffer (safe) +Buffer.allocUnsafe(16) // create an uninitialized buffer (potentially unsafe) +``` + +## api + +### Class Method: Buffer.from(array) + + +* `array` {Array} + +Allocates a new `Buffer` using an `array` of octets. + +```js +const buf = Buffer.from([0x62,0x75,0x66,0x66,0x65,0x72]); + // creates a new Buffer containing ASCII bytes + // ['b','u','f','f','e','r'] +``` + +A `TypeError` will be thrown if `array` is not an `Array`. + +### Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]]) + + +* `arrayBuffer` {ArrayBuffer} The `.buffer` property of a `TypedArray` or + a `new ArrayBuffer()` +* `byteOffset` {Number} Default: `0` +* `length` {Number} Default: `arrayBuffer.length - byteOffset` + +When passed a reference to the `.buffer` property of a `TypedArray` instance, +the newly created `Buffer` will share the same allocated memory as the +TypedArray. + +```js +const arr = new Uint16Array(2); +arr[0] = 5000; +arr[1] = 4000; + +const buf = Buffer.from(arr.buffer); // shares the memory with arr; + +console.log(buf); + // Prints: + +// changing the TypedArray changes the Buffer also +arr[1] = 6000; + +console.log(buf); + // Prints: +``` + +The optional `byteOffset` and `length` arguments specify a memory range within +the `arrayBuffer` that will be shared by the `Buffer`. + +```js +const ab = new ArrayBuffer(10); +const buf = Buffer.from(ab, 0, 2); +console.log(buf.length); + // Prints: 2 +``` + +A `TypeError` will be thrown if `arrayBuffer` is not an `ArrayBuffer`. + +### Class Method: Buffer.from(buffer) + + +* `buffer` {Buffer} + +Copies the passed `buffer` data onto a new `Buffer` instance. + +```js +const buf1 = Buffer.from('buffer'); +const buf2 = Buffer.from(buf1); + +buf1[0] = 0x61; +console.log(buf1.toString()); + // 'auffer' +console.log(buf2.toString()); + // 'buffer' (copy is not changed) +``` + +A `TypeError` will be thrown if `buffer` is not a `Buffer`. + +### Class Method: Buffer.from(str[, encoding]) + + +* `str` {String} String to encode. +* `encoding` {String} Encoding to use, Default: `'utf8'` + +Creates a new `Buffer` containing the given JavaScript string `str`. If +provided, the `encoding` parameter identifies the character encoding. +If not provided, `encoding` defaults to `'utf8'`. + +```js +const buf1 = Buffer.from('this is a tést'); +console.log(buf1.toString()); + // prints: this is a tést +console.log(buf1.toString('ascii')); + // prints: this is a tC)st + +const buf2 = Buffer.from('7468697320697320612074c3a97374', 'hex'); +console.log(buf2.toString()); + // prints: this is a tést +``` + +A `TypeError` will be thrown if `str` is not a string. + +### Class Method: Buffer.alloc(size[, fill[, encoding]]) + + +* `size` {Number} +* `fill` {Value} Default: `undefined` +* `encoding` {String} Default: `utf8` + +Allocates a new `Buffer` of `size` bytes. If `fill` is `undefined`, the +`Buffer` will be *zero-filled*. + +```js +const buf = Buffer.alloc(5); +console.log(buf); + // +``` + +The `size` must be less than or equal to the value of +`require('buffer').kMaxLength` (on 64-bit architectures, `kMaxLength` is +`(2^31)-1`). Otherwise, a [`RangeError`][] is thrown. A zero-length Buffer will +be created if a `size` less than or equal to 0 is specified. + +If `fill` is specified, the allocated `Buffer` will be initialized by calling +`buf.fill(fill)`. See [`buf.fill()`][] for more information. + +```js +const buf = Buffer.alloc(5, 'a'); +console.log(buf); + // +``` + +If both `fill` and `encoding` are specified, the allocated `Buffer` will be +initialized by calling `buf.fill(fill, encoding)`. For example: + +```js +const buf = Buffer.alloc(11, 'aGVsbG8gd29ybGQ=', 'base64'); +console.log(buf); + // +``` + +Calling `Buffer.alloc(size)` can be significantly slower than the alternative +`Buffer.allocUnsafe(size)` but ensures that the newly created `Buffer` instance +contents will *never contain sensitive data*. + +A `TypeError` will be thrown if `size` is not a number. + +### Class Method: Buffer.allocUnsafe(size) + + +* `size` {Number} + +Allocates a new *non-zero-filled* `Buffer` of `size` bytes. The `size` must +be less than or equal to the value of `require('buffer').kMaxLength` (on 64-bit +architectures, `kMaxLength` is `(2^31)-1`). Otherwise, a [`RangeError`][] is +thrown. A zero-length Buffer will be created if a `size` less than or equal to +0 is specified. + +The underlying memory for `Buffer` instances created in this way is *not +initialized*. The contents of the newly created `Buffer` are unknown and +*may contain sensitive data*. Use [`buf.fill(0)`][] to initialize such +`Buffer` instances to zeroes. + +```js +const buf = Buffer.allocUnsafe(5); +console.log(buf); + // + // (octets will be different, every time) +buf.fill(0); +console.log(buf); + // +``` + +A `TypeError` will be thrown if `size` is not a number. + +Note that the `Buffer` module pre-allocates an internal `Buffer` instance of +size `Buffer.poolSize` that is used as a pool for the fast allocation of new +`Buffer` instances created using `Buffer.allocUnsafe(size)` (and the deprecated +`new Buffer(size)` constructor) only when `size` is less than or equal to +`Buffer.poolSize >> 1` (floor of `Buffer.poolSize` divided by two). The default +value of `Buffer.poolSize` is `8192` but can be modified. + +Use of this pre-allocated internal memory pool is a key difference between +calling `Buffer.alloc(size, fill)` vs. `Buffer.allocUnsafe(size).fill(fill)`. +Specifically, `Buffer.alloc(size, fill)` will *never* use the internal Buffer +pool, while `Buffer.allocUnsafe(size).fill(fill)` *will* use the internal +Buffer pool if `size` is less than or equal to half `Buffer.poolSize`. The +difference is subtle but can be important when an application requires the +additional performance that `Buffer.allocUnsafe(size)` provides. + +### Class Method: Buffer.allocUnsafeSlow(size) + + +* `size` {Number} + +Allocates a new *non-zero-filled* and non-pooled `Buffer` of `size` bytes. The +`size` must be less than or equal to the value of +`require('buffer').kMaxLength` (on 64-bit architectures, `kMaxLength` is +`(2^31)-1`). Otherwise, a [`RangeError`][] is thrown. A zero-length Buffer will +be created if a `size` less than or equal to 0 is specified. + +The underlying memory for `Buffer` instances created in this way is *not +initialized*. The contents of the newly created `Buffer` are unknown and +*may contain sensitive data*. Use [`buf.fill(0)`][] to initialize such +`Buffer` instances to zeroes. + +When using `Buffer.allocUnsafe()` to allocate new `Buffer` instances, +allocations under 4KB are, by default, sliced from a single pre-allocated +`Buffer`. This allows applications to avoid the garbage collection overhead of +creating many individually allocated Buffers. This approach improves both +performance and memory usage by eliminating the need to track and cleanup as +many `Persistent` objects. + +However, in the case where a developer may need to retain a small chunk of +memory from a pool for an indeterminate amount of time, it may be appropriate +to create an un-pooled Buffer instance using `Buffer.allocUnsafeSlow()` then +copy out the relevant bits. + +```js +// need to keep around a few small chunks of memory +const store = []; + +socket.on('readable', () => { + const data = socket.read(); + // allocate for retained data + const sb = Buffer.allocUnsafeSlow(10); + // copy the data into the new allocation + data.copy(sb, 0, 0, 10); + store.push(sb); +}); +``` + +Use of `Buffer.allocUnsafeSlow()` should be used only as a last resort *after* +a developer has observed undue memory retention in their applications. + +A `TypeError` will be thrown if `size` is not a number. + +### All the Rest + +The rest of the `Buffer` API is exactly the same as in node.js. +[See the docs](https://nodejs.org/api/buffer.html). + + +## Related links + +- [Node.js issue: Buffer(number) is unsafe](https://github.com/nodejs/node/issues/4660) +- [Node.js Enhancement Proposal: Buffer.from/Buffer.alloc/Buffer.zalloc/Buffer() soft-deprecate](https://github.com/nodejs/node-eps/pull/4) + +## Why is `Buffer` unsafe? + +Today, the node.js `Buffer` constructor is overloaded to handle many different argument +types like `String`, `Array`, `Object`, `TypedArrayView` (`Uint8Array`, etc.), +`ArrayBuffer`, and also `Number`. + +The API is optimized for convenience: you can throw any type at it, and it will try to do +what you want. + +Because the Buffer constructor is so powerful, you often see code like this: + +```js +// Convert UTF-8 strings to hex +function toHex (str) { + return new Buffer(str).toString('hex') +} +``` + +***But what happens if `toHex` is called with a `Number` argument?*** + +### Remote Memory Disclosure + +If an attacker can make your program call the `Buffer` constructor with a `Number` +argument, then they can make it allocate uninitialized memory from the node.js process. +This could potentially disclose TLS private keys, user data, or database passwords. + +When the `Buffer` constructor is passed a `Number` argument, it returns an +**UNINITIALIZED** block of memory of the specified `size`. When you create a `Buffer` like +this, you **MUST** overwrite the contents before returning it to the user. + +From the [node.js docs](https://nodejs.org/api/buffer.html#buffer_new_buffer_size): + +> `new Buffer(size)` +> +> - `size` Number +> +> The underlying memory for `Buffer` instances created in this way is not initialized. +> **The contents of a newly created `Buffer` are unknown and could contain sensitive +> data.** Use `buf.fill(0)` to initialize a Buffer to zeroes. + +(Emphasis our own.) + +Whenever the programmer intended to create an uninitialized `Buffer` you often see code +like this: + +```js +var buf = new Buffer(16) + +// Immediately overwrite the uninitialized buffer with data from another buffer +for (var i = 0; i < buf.length; i++) { + buf[i] = otherBuf[i] +} +``` + + +### Would this ever be a problem in real code? + +Yes. It's surprisingly common to forget to check the type of your variables in a +dynamically-typed language like JavaScript. + +Usually the consequences of assuming the wrong type is that your program crashes with an +uncaught exception. But the failure mode for forgetting to check the type of arguments to +the `Buffer` constructor is more catastrophic. + +Here's an example of a vulnerable service that takes a JSON payload and converts it to +hex: + +```js +// Take a JSON payload {str: "some string"} and convert it to hex +var server = http.createServer(function (req, res) { + var data = '' + req.setEncoding('utf8') + req.on('data', function (chunk) { + data += chunk + }) + req.on('end', function () { + var body = JSON.parse(data) + res.end(new Buffer(body.str).toString('hex')) + }) +}) + +server.listen(8080) +``` + +In this example, an http client just has to send: + +```json +{ + "str": 1000 +} +``` + +and it will get back 1,000 bytes of uninitialized memory from the server. + +This is a very serious bug. It's similar in severity to the +[the Heartbleed bug](http://heartbleed.com/) that allowed disclosure of OpenSSL process +memory by remote attackers. + + +### Which real-world packages were vulnerable? + +#### [`bittorrent-dht`](https://www.npmjs.com/package/bittorrent-dht) + +[Mathias Buus](https://github.com/mafintosh) and I +([Feross Aboukhadijeh](http://feross.org/)) found this issue in one of our own packages, +[`bittorrent-dht`](https://www.npmjs.com/package/bittorrent-dht). The bug would allow +anyone on the internet to send a series of messages to a user of `bittorrent-dht` and get +them to reveal 20 bytes at a time of uninitialized memory from the node.js process. + +Here's +[the commit](https://github.com/feross/bittorrent-dht/commit/6c7da04025d5633699800a99ec3fbadf70ad35b8) +that fixed it. We released a new fixed version, created a +[Node Security Project disclosure](https://nodesecurity.io/advisories/68), and deprecated all +vulnerable versions on npm so users will get a warning to upgrade to a newer version. + +#### [`ws`](https://www.npmjs.com/package/ws) + +That got us wondering if there were other vulnerable packages. Sure enough, within a short +period of time, we found the same issue in [`ws`](https://www.npmjs.com/package/ws), the +most popular WebSocket implementation in node.js. + +If certain APIs were called with `Number` parameters instead of `String` or `Buffer` as +expected, then uninitialized server memory would be disclosed to the remote peer. + +These were the vulnerable methods: + +```js +socket.send(number) +socket.ping(number) +socket.pong(number) +``` + +Here's a vulnerable socket server with some echo functionality: + +```js +server.on('connection', function (socket) { + socket.on('message', function (message) { + message = JSON.parse(message) + if (message.type === 'echo') { + socket.send(message.data) // send back the user's message + } + }) +}) +``` + +`socket.send(number)` called on the server, will disclose server memory. + +Here's [the release](https://github.com/websockets/ws/releases/tag/1.0.1) where the issue +was fixed, with a more detailed explanation. Props to +[Arnout Kazemier](https://github.com/3rd-Eden) for the quick fix. Here's the +[Node Security Project disclosure](https://nodesecurity.io/advisories/67). + + +### What's the solution? + +It's important that node.js offers a fast way to get memory otherwise performance-critical +applications would needlessly get a lot slower. + +But we need a better way to *signal our intent* as programmers. **When we want +uninitialized memory, we should request it explicitly.** + +Sensitive functionality should not be packed into a developer-friendly API that loosely +accepts many different types. This type of API encourages the lazy practice of passing +variables in without checking the type very carefully. + +#### A new API: `Buffer.allocUnsafe(number)` + +The functionality of creating buffers with uninitialized memory should be part of another +API. We propose `Buffer.allocUnsafe(number)`. This way, it's not part of an API that +frequently gets user input of all sorts of different types passed into it. + +```js +var buf = Buffer.allocUnsafe(16) // careful, uninitialized memory! + +// Immediately overwrite the uninitialized buffer with data from another buffer +for (var i = 0; i < buf.length; i++) { + buf[i] = otherBuf[i] +} +``` + + +### How do we fix node.js core? + +We sent [a PR to node.js core](https://github.com/nodejs/node/pull/4514) (merged as +`semver-major`) which defends against one case: + +```js +var str = 16 +new Buffer(str, 'utf8') +``` + +In this situation, it's implied that the programmer intended the first argument to be a +string, since they passed an encoding as a second argument. Today, node.js will allocate +uninitialized memory in the case of `new Buffer(number, encoding)`, which is probably not +what the programmer intended. + +But this is only a partial solution, since if the programmer does `new Buffer(variable)` +(without an `encoding` parameter) there's no way to know what they intended. If `variable` +is sometimes a number, then uninitialized memory will sometimes be returned. + +### What's the real long-term fix? + +We could deprecate and remove `new Buffer(number)` and use `Buffer.allocUnsafe(number)` when +we need uninitialized memory. But that would break 1000s of packages. + +~~We believe the best solution is to:~~ + +~~1. Change `new Buffer(number)` to return safe, zeroed-out memory~~ + +~~2. Create a new API for creating uninitialized Buffers. We propose: `Buffer.allocUnsafe(number)`~~ + +#### Update + +We now support adding three new APIs: + +- `Buffer.from(value)` - convert from any type to a buffer +- `Buffer.alloc(size)` - create a zero-filled buffer +- `Buffer.allocUnsafe(size)` - create an uninitialized buffer with given size + +This solves the core problem that affected `ws` and `bittorrent-dht` which is +`Buffer(variable)` getting tricked into taking a number argument. + +This way, existing code continues working and the impact on the npm ecosystem will be +minimal. Over time, npm maintainers can migrate performance-critical code to use +`Buffer.allocUnsafe(number)` instead of `new Buffer(number)`. + + +### Conclusion + +We think there's a serious design issue with the `Buffer` API as it exists today. It +promotes insecure software by putting high-risk functionality into a convenient API +with friendly "developer ergonomics". + +This wasn't merely a theoretical exercise because we found the issue in some of the +most popular npm packages. + +Fortunately, there's an easy fix that can be applied today. Use `safe-buffer` in place of +`buffer`. + +```js +var Buffer = require('safe-buffer').Buffer +``` + +Eventually, we hope that node.js core can switch to this new, safer behavior. We believe +the impact on the ecosystem would be minimal since it's not a breaking change. +Well-maintained, popular packages would be updated to use `Buffer.alloc` quickly, while +older, insecure packages would magically become safe from this attack vector. + + +## links + +- [Node.js PR: buffer: throw if both length and enc are passed](https://github.com/nodejs/node/pull/4514) +- [Node Security Project disclosure for `ws`](https://nodesecurity.io/advisories/67) +- [Node Security Project disclosure for`bittorrent-dht`](https://nodesecurity.io/advisories/68) + + +## credit + +The original issues in `bittorrent-dht` +([disclosure](https://nodesecurity.io/advisories/68)) and +`ws` ([disclosure](https://nodesecurity.io/advisories/67)) were discovered by +[Mathias Buus](https://github.com/mafintosh) and +[Feross Aboukhadijeh](http://feross.org/). + +Thanks to [Adam Baldwin](https://github.com/evilpacket) for helping disclose these issues +and for his work running the [Node Security Project](https://nodesecurity.io/). + +Thanks to [John Hiesey](https://github.com/jhiesey) for proofreading this README and +auditing the code. + + +## license + +MIT. Copyright (C) [Feross Aboukhadijeh](http://feross.org) diff --git a/nodejs/node_modules/safe-buffer/index.js b/nodejs/node_modules/safe-buffer/index.js new file mode 100644 index 000000000..22438dabb --- /dev/null +++ b/nodejs/node_modules/safe-buffer/index.js @@ -0,0 +1,62 @@ +/* eslint-disable node/no-deprecated-api */ +var buffer = require('buffer') +var Buffer = buffer.Buffer + +// alternative to using Object.keys for old browsers +function copyProps (src, dst) { + for (var key in src) { + dst[key] = src[key] + } +} +if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) { + module.exports = buffer +} else { + // Copy properties from require('buffer') + copyProps(buffer, exports) + exports.Buffer = SafeBuffer +} + +function SafeBuffer (arg, encodingOrOffset, length) { + return Buffer(arg, encodingOrOffset, length) +} + +// Copy static methods from Buffer +copyProps(Buffer, SafeBuffer) + +SafeBuffer.from = function (arg, encodingOrOffset, length) { + if (typeof arg === 'number') { + throw new TypeError('Argument must not be a number') + } + return Buffer(arg, encodingOrOffset, length) +} + +SafeBuffer.alloc = function (size, fill, encoding) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + var buf = Buffer(size) + if (fill !== undefined) { + if (typeof encoding === 'string') { + buf.fill(fill, encoding) + } else { + buf.fill(fill) + } + } else { + buf.fill(0) + } + return buf +} + +SafeBuffer.allocUnsafe = function (size) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + return Buffer(size) +} + +SafeBuffer.allocUnsafeSlow = function (size) { + if (typeof size !== 'number') { + throw new TypeError('Argument must be a number') + } + return buffer.SlowBuffer(size) +} diff --git a/nodejs/node_modules/safe-buffer/package.json b/nodejs/node_modules/safe-buffer/package.json new file mode 100644 index 000000000..c23754236 --- /dev/null +++ b/nodejs/node_modules/safe-buffer/package.json @@ -0,0 +1,65 @@ +{ + "_args": [ + [ + "safe-buffer@5.1.1", + "/Users/muammar/github/mkchromecast/nodejs" + ] + ], + "_from": "safe-buffer@5.1.1", + "_id": "safe-buffer@5.1.1", + "_inBundle": false, + "_integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "_location": "/safe-buffer", + "_phantomChildren": {}, + "_requested": { + "type": "version", + "registry": true, + "raw": "safe-buffer@5.1.1", + "name": "safe-buffer", + "escapedName": "safe-buffer", + "rawSpec": "5.1.1", + "saveSpec": null, + "fetchSpec": "5.1.1" + }, + "_requiredBy": [ + "/express" + ], + "_resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "_spec": "5.1.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", + "author": { + "name": "Feross Aboukhadijeh", + "email": "feross@feross.org", + "url": "http://feross.org" + }, + "bugs": { + "url": "https://github.com/feross/safe-buffer/issues" + }, + "description": "Safer Node.js Buffer API", + "devDependencies": { + "standard": "*", + "tape": "^4.0.0", + "zuul": "^3.0.0" + }, + "homepage": "https://github.com/feross/safe-buffer", + "keywords": [ + "buffer", + "buffer allocate", + "node security", + "safe", + "safe-buffer", + "security", + "uninitialized" + ], + "license": "MIT", + "main": "index.js", + "name": "safe-buffer", + "repository": { + "type": "git", + "url": "git://github.com/feross/safe-buffer.git" + }, + "scripts": { + "test": "standard && tape test.js" + }, + "version": "5.1.1" +} diff --git a/nodejs/node_modules/safe-buffer/test.js b/nodejs/node_modules/safe-buffer/test.js new file mode 100644 index 000000000..4925059c5 --- /dev/null +++ b/nodejs/node_modules/safe-buffer/test.js @@ -0,0 +1,101 @@ +/* eslint-disable node/no-deprecated-api */ + +var test = require('tape') +var SafeBuffer = require('./').Buffer + +test('new SafeBuffer(value) works just like Buffer', function (t) { + t.deepEqual(new SafeBuffer('hey'), new Buffer('hey')) + t.deepEqual(new SafeBuffer('hey', 'utf8'), new Buffer('hey', 'utf8')) + t.deepEqual(new SafeBuffer('686579', 'hex'), new Buffer('686579', 'hex')) + t.deepEqual(new SafeBuffer([1, 2, 3]), new Buffer([1, 2, 3])) + t.deepEqual(new SafeBuffer(new Uint8Array([1, 2, 3])), new Buffer(new Uint8Array([1, 2, 3]))) + + t.equal(typeof SafeBuffer.isBuffer, 'function') + t.equal(SafeBuffer.isBuffer(new SafeBuffer('hey')), true) + t.equal(Buffer.isBuffer(new SafeBuffer('hey')), true) + t.notOk(SafeBuffer.isBuffer({})) + + t.end() +}) + +test('SafeBuffer.from(value) converts to a Buffer', function (t) { + t.deepEqual(SafeBuffer.from('hey'), new Buffer('hey')) + t.deepEqual(SafeBuffer.from('hey', 'utf8'), new Buffer('hey', 'utf8')) + t.deepEqual(SafeBuffer.from('686579', 'hex'), new Buffer('686579', 'hex')) + t.deepEqual(SafeBuffer.from([1, 2, 3]), new Buffer([1, 2, 3])) + t.deepEqual(SafeBuffer.from(new Uint8Array([1, 2, 3])), new Buffer(new Uint8Array([1, 2, 3]))) + + t.end() +}) + +test('SafeBuffer.alloc(number) returns zeroed-out memory', function (t) { + for (var i = 0; i < 10; i++) { + var expected1 = new Buffer(1000) + expected1.fill(0) + t.deepEqual(SafeBuffer.alloc(1000), expected1) + + var expected2 = new Buffer(1000 * 1000) + expected2.fill(0) + t.deepEqual(SafeBuffer.alloc(1000 * 1000), expected2) + } + t.end() +}) + +test('SafeBuffer.allocUnsafe(number)', function (t) { + var buf = SafeBuffer.allocUnsafe(100) // unitialized memory + t.equal(buf.length, 100) + t.equal(SafeBuffer.isBuffer(buf), true) + t.equal(Buffer.isBuffer(buf), true) + t.end() +}) + +test('SafeBuffer.from() throws with number types', function (t) { + t.plan(5) + t.throws(function () { + SafeBuffer.from(0) + }) + t.throws(function () { + SafeBuffer.from(-1) + }) + t.throws(function () { + SafeBuffer.from(NaN) + }) + t.throws(function () { + SafeBuffer.from(Infinity) + }) + t.throws(function () { + SafeBuffer.from(99) + }) +}) + +test('SafeBuffer.allocUnsafe() throws with non-number types', function (t) { + t.plan(4) + t.throws(function () { + SafeBuffer.allocUnsafe('hey') + }) + t.throws(function () { + SafeBuffer.allocUnsafe('hey', 'utf8') + }) + t.throws(function () { + SafeBuffer.allocUnsafe([1, 2, 3]) + }) + t.throws(function () { + SafeBuffer.allocUnsafe({}) + }) +}) + +test('SafeBuffer.alloc() throws with non-number types', function (t) { + t.plan(4) + t.throws(function () { + SafeBuffer.alloc('hey') + }) + t.throws(function () { + SafeBuffer.alloc('hey', 'utf8') + }) + t.throws(function () { + SafeBuffer.alloc([1, 2, 3]) + }) + t.throws(function () { + SafeBuffer.alloc({}) + }) +}) diff --git a/nodejs/node_modules/send/HISTORY.md b/nodejs/node_modules/send/HISTORY.md index 1eacafa2e..1865dcd16 100644 --- a/nodejs/node_modules/send/HISTORY.md +++ b/nodejs/node_modules/send/HISTORY.md @@ -1,3 +1,59 @@ +0.16.1 / 2017-09-29 +=================== + + * Fix regression in edge-case behavior for empty `path` + +0.16.0 / 2017-09-27 +=================== + + * Add `immutable` option + * Fix missing `` in default error & redirects + * Use instance methods on steam to check for listeners + * deps: mime@1.4.1 + - Add 70 new types for file extensions + - Set charset as "UTF-8" for .js and .json + * perf: improve path validation speed + +0.15.6 / 2017-09-22 +=================== + + * deps: debug@2.6.9 + * perf: improve `If-Match` token parsing + +0.15.5 / 2017-09-20 +=================== + + * deps: etag@~1.8.1 + - perf: replace regular expression with substring + * deps: fresh@0.5.2 + - Fix handling of modified headers with invalid dates + - perf: improve ETag match loop + - perf: improve `If-None-Match` token parsing + +0.15.4 / 2017-08-05 +=================== + + * deps: debug@2.6.8 + * deps: depd@~1.1.1 + - Remove unnecessary `Buffer` loading + * deps: http-errors@~1.6.2 + - deps: depd@1.1.1 + +0.15.3 / 2017-05-16 +=================== + + * deps: debug@2.6.7 + - deps: ms@2.0.0 + * deps: ms@2.0.0 + +0.15.2 / 2017-04-26 +=================== + + * deps: debug@2.6.4 + - Fix `DEBUG_MAX_ARRAY_LENGTH` + - deps: ms@0.7.3 + * deps: ms@1.0.0 + 0.15.1 / 2017-03-04 =================== diff --git a/nodejs/node_modules/send/README.md b/nodejs/node_modules/send/README.md index 0c8d11df6..ca591ed4c 100644 --- a/nodejs/node_modules/send/README.md +++ b/nodejs/node_modules/send/README.md @@ -50,7 +50,7 @@ of the `Range` request header. ##### cacheControl Enable or disable setting `Cache-Control` response header, defaults to -true. Disabling this will ignore the `maxAge` option. +true. Disabling this will ignore the `immutable` and `maxAge` options. ##### dotfiles @@ -86,6 +86,14 @@ in the given order. By default, this is disabled (set to `false`). An example value that will serve extension-less HTML files: `['html', 'htm']`. This is skipped if the requested file already has an extension. +##### immutable + +Enable or diable the `immutable` directive in the `Cache-Control` response +header, defaults to `false`. If set to `true`, the `maxAge` option should +also be specified to enable caching. The `immutable` directive will prevent +supported clients from making conditional requests during the life of the +`maxAge` option to check if the file has changed. + ##### index By default send supports "index.html" files, to disable this diff --git a/nodejs/node_modules/send/index.js b/nodejs/node_modules/send/index.js index 375684125..c4c967739 100644 --- a/nodejs/node_modules/send/index.js +++ b/nodejs/node_modules/send/index.js @@ -19,7 +19,6 @@ var destroy = require('destroy') var encodeUrl = require('encodeurl') var escapeHtml = require('escape-html') var etag = require('etag') -var EventEmitter = require('events').EventEmitter var fresh = require('fresh') var fs = require('fs') var mime = require('mime') @@ -49,13 +48,6 @@ var sep = path.sep var BYTES_RANGE_REGEXP = /^ *bytes=/ -/** - * Simple expression to split token list. - * @private - */ - -var TOKEN_LIST_REGEXP = / *, */ - /** * Maximum value allowed for the max age. * @private @@ -78,14 +70,6 @@ var UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/ module.exports = send module.exports.mime = mime -/** - * Shim EventEmitter.listenerCount for node.js < 0.10 - */ - -/* istanbul ignore next */ -var listenerCount = EventEmitter.listenerCount || - function (emitter, type) { return emitter.listeners(type).length } - /** * Return a `SendStream` for `req` and `path`. * @@ -153,6 +137,10 @@ function SendStream (req, path, options) { ? normalizeList(opts.extensions, 'extensions option') : [] + this._immutable = opts.immutable !== undefined + ? Boolean(opts.immutable) + : false + this._index = opts.index !== undefined ? normalizeList(opts.index, 'index option') : ['index.html'] @@ -278,7 +266,7 @@ SendStream.prototype.maxage = deprecate.function(function maxage (maxAge) { SendStream.prototype.error = function error (status, err) { // emit if listeners instead of responding - if (listenerCount(this, 'error') !== 0) { + if (hasListeners(this, 'error')) { return this.emit('error', createError(status, err, { expose: false })) @@ -345,7 +333,7 @@ SendStream.prototype.isPreconditionFailure = function isPreconditionFailure () { var match = req.headers['if-match'] if (match) { var etag = res.getHeader('ETag') - return !etag || (match !== '*' && match.split(TOKEN_LIST_REGEXP).every(function (match) { + return !etag || (match !== '*' && parseTokenList(match).every(function (match) { return match !== etag && match !== 'W/' + etag && 'W/' + match !== etag })) } @@ -487,7 +475,7 @@ SendStream.prototype.isRangeFresh = function isRangeFresh () { SendStream.prototype.redirect = function redirect (path) { var res = this.res - if (listenerCount(this, 'directory') !== 0) { + if (hasListeners(this, 'directory')) { this.emit('directory', res, path) return } @@ -541,19 +529,24 @@ SendStream.prototype.pipe = function pipe (res) { var parts if (root !== null) { + // normalize + if (path) { + path = normalize('.' + sep + path) + } + // malicious path - if (UP_PATH_REGEXP.test(normalize('.' + sep + path))) { + if (UP_PATH_REGEXP.test(path)) { debug('malicious path "%s"', path) this.error(403) return res } + // explode path parts + parts = path.split(sep) + // join / normalize from optional root dir path = normalize(join(root, path)) root = normalize(root + sep) - - // explode path parts - parts = path.substr(root.length).split(sep) } else { // ".." is malicious without "root" if (UP_PATH_REGEXP.test(path)) { @@ -877,6 +870,11 @@ SendStream.prototype.setHeader = function setHeader (path, stat) { if (this._cacheControl && !res.getHeader('Cache-Control')) { var cacheControl = 'public, max-age=' + Math.floor(this._maxage / 1000) + + if (this._immutable) { + cacheControl += ', immutable' + } + debug('cache-control %s', cacheControl) res.setHeader('Cache-Control', cacheControl) } @@ -935,7 +933,8 @@ function collapseLeadingSlashes (str) { function containsDotFile (parts) { for (var i = 0; i < parts.length; i++) { - if (parts[i][0] === '.') { + var part = parts[i] + if (part.length > 1 && part[0] === '.') { return true } } @@ -972,7 +971,8 @@ function createHtmlDocument (title, body) { '\n' + '\n' + '
' + body + '
\n' + - '\n' + '\n' + + '\n' } /** @@ -1007,6 +1007,26 @@ function getHeaderNames (res) { : res.getHeaderNames() } +/** + * Determine if emitter has listeners of a given type. + * + * The way to do this check is done three different ways in Node.js >= 0.8 + * so this consolidates them into a minimal set using instance methods. + * + * @param {EventEmitter} emitter + * @param {string} type + * @returns {boolean} + * @private + */ + +function hasListeners (emitter, type) { + var count = typeof emitter.listenerCount !== 'function' + ? emitter.listeners(type).length + : emitter.listenerCount(type) + + return count > 0 +} + /** * Determine if the response headers have been sent. * @@ -1056,6 +1076,42 @@ function parseHttpDate (date) { : NaN } +/** + * Parse a HTTP token list. + * + * @param {string} str + * @private + */ + +function parseTokenList (str) { + var end = 0 + var list = [] + var start = 0 + + // gather tokens + for (var i = 0, len = str.length; i < len; i++) { + switch (str.charCodeAt(i)) { + case 0x20: /* */ + if (start === end) { + start = end = i + 1 + } + break + case 0x2c: /* , */ + list.push(str.substring(start, end)) + start = end = i + 1 + break + default: + end = i + 1 + break + } + } + + // final token + list.push(str.substring(start, end)) + + return list +} + /** * Set an object of headers on a response. * diff --git a/nodejs/node_modules/send/node_modules/debug/.coveralls.yml b/nodejs/node_modules/send/node_modules/debug/.coveralls.yml deleted file mode 100644 index 20a706858..000000000 --- a/nodejs/node_modules/send/node_modules/debug/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -repo_token: SIAeZjKYlHK74rbcFvNHMUzjRiMpflxve diff --git a/nodejs/node_modules/send/node_modules/debug/.eslintrc b/nodejs/node_modules/send/node_modules/debug/.eslintrc deleted file mode 100644 index 8a37ae2c2..000000000 --- a/nodejs/node_modules/send/node_modules/debug/.eslintrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "env": { - "browser": true, - "node": true - }, - "rules": { - "no-console": 0, - "no-empty": [1, { "allowEmptyCatch": true }] - }, - "extends": "eslint:recommended" -} diff --git a/nodejs/node_modules/send/node_modules/debug/.npmignore b/nodejs/node_modules/send/node_modules/debug/.npmignore deleted file mode 100644 index db2fbb9db..000000000 --- a/nodejs/node_modules/send/node_modules/debug/.npmignore +++ /dev/null @@ -1,8 +0,0 @@ -support -test -examples -example -*.sock -dist -yarn.lock -coverage diff --git a/nodejs/node_modules/send/node_modules/debug/.travis.yml b/nodejs/node_modules/send/node_modules/debug/.travis.yml deleted file mode 100644 index 6c6090c3b..000000000 --- a/nodejs/node_modules/send/node_modules/debug/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ - -language: node_js -node_js: - - "6" - - "5" - - "4" - -install: - - make node_modules - -script: - - make lint - - make test - - make coveralls diff --git a/nodejs/node_modules/send/node_modules/debug/CHANGELOG.md b/nodejs/node_modules/send/node_modules/debug/CHANGELOG.md deleted file mode 100644 index 99abf97fe..000000000 --- a/nodejs/node_modules/send/node_modules/debug/CHANGELOG.md +++ /dev/null @@ -1,316 +0,0 @@ -2.6.1 / 2017-02-10 -================== - - * Fix: Module's `export default` syntax fix for IE8 `Expected identifier` error - * Fix: Whitelist DEBUG_FD for values 1 and 2 only (#415, @pi0) - * Fix: IE8 "Expected identifier" error (#414, @vgoma) - * Fix: Namespaces would not disable once enabled (#409, @musikov) - -2.6.0 / 2016-12-28 -================== - - * Fix: added better null pointer checks for browser useColors (@thebigredgeek) - * Improvement: removed explicit `window.debug` export (#404, @tootallnate) - * Improvement: deprecated `DEBUG_FD` environment variable (#405, @tootallnate) - -2.5.2 / 2016-12-25 -================== - - * Fix: reference error on window within webworkers (#393, @KlausTrainer) - * Docs: fixed README typo (#391, @lurch) - * Docs: added notice about v3 api discussion (@thebigredgeek) - -2.5.1 / 2016-12-20 -================== - - * Fix: babel-core compatibility - -2.5.0 / 2016-12-20 -================== - - * Fix: wrong reference in bower file (@thebigredgeek) - * Fix: webworker compatibility (@thebigredgeek) - * Fix: output formatting issue (#388, @kribblo) - * Fix: babel-loader compatibility (#383, @escwald) - * Misc: removed built asset from repo and publications (@thebigredgeek) - * Misc: moved source files to /src (#378, @yamikuronue) - * Test: added karma integration and replaced babel with browserify for browser tests (#378, @yamikuronue) - * Test: coveralls integration (#378, @yamikuronue) - * Docs: simplified language in the opening paragraph (#373, @yamikuronue) - -2.4.5 / 2016-12-17 -================== - - * Fix: `navigator` undefined in Rhino (#376, @jochenberger) - * Fix: custom log function (#379, @hsiliev) - * Improvement: bit of cleanup + linting fixes (@thebigredgeek) - * Improvement: rm non-maintainted `dist/` dir (#375, @freewil) - * Docs: simplified language in the opening paragraph. (#373, @yamikuronue) - -2.4.4 / 2016-12-14 -================== - - * Fix: work around debug being loaded in preload scripts for electron (#368, @paulcbetts) - -2.4.3 / 2016-12-14 -================== - - * Fix: navigation.userAgent error for react native (#364, @escwald) - -2.4.2 / 2016-12-14 -================== - - * Fix: browser colors (#367, @tootallnate) - * Misc: travis ci integration (@thebigredgeek) - * Misc: added linting and testing boilerplate with sanity check (@thebigredgeek) - -2.4.1 / 2016-12-13 -================== - - * Fix: typo that broke the package (#356) - -2.4.0 / 2016-12-13 -================== - - * Fix: bower.json references unbuilt src entry point (#342, @justmatt) - * Fix: revert "handle regex special characters" (@tootallnate) - * Feature: configurable util.inspect()`options for NodeJS (#327, @tootallnate) - * Feature: %O`(big O) pretty-prints objects (#322, @tootallnate) - * Improvement: allow colors in workers (#335, @botverse) - * Improvement: use same color for same namespace. (#338, @lchenay) - -2.3.3 / 2016-11-09 -================== - - * Fix: Catch `JSON.stringify()` errors (#195, Jovan Alleyne) - * Fix: Returning `localStorage` saved values (#331, Levi Thomason) - * Improvement: Don't create an empty object when no `process` (Nathan Rajlich) - -2.3.2 / 2016-11-09 -================== - - * Fix: be super-safe in index.js as well (@TooTallNate) - * Fix: should check whether process exists (Tom Newby) - -2.3.1 / 2016-11-09 -================== - - * Fix: Added electron compatibility (#324, @paulcbetts) - * Improvement: Added performance optimizations (@tootallnate) - * Readme: Corrected PowerShell environment variable example (#252, @gimre) - * Misc: Removed yarn lock file from source control (#321, @fengmk2) - -2.3.0 / 2016-11-07 -================== - - * Fix: Consistent placement of ms diff at end of output (#215, @gorangajic) - * Fix: Escaping of regex special characters in namespace strings (#250, @zacronos) - * Fix: Fixed bug causing crash on react-native (#282, @vkarpov15) - * Feature: Enabled ES6+ compatible import via default export (#212 @bucaran) - * Feature: Added %O formatter to reflect Chrome's console.log capability (#279, @oncletom) - * Package: Update "ms" to 0.7.2 (#315, @DevSide) - * Package: removed superfluous version property from bower.json (#207 @kkirsche) - * Readme: fix USE_COLORS to DEBUG_COLORS - * Readme: Doc fixes for format string sugar (#269, @mlucool) - * Readme: Updated docs for DEBUG_FD and DEBUG_COLORS environment variables (#232, @mattlyons0) - * Readme: doc fixes for PowerShell (#271 #243, @exoticknight @unreadable) - * Readme: better docs for browser support (#224, @matthewmueller) - * Tooling: Added yarn integration for development (#317, @thebigredgeek) - * Misc: Renamed History.md to CHANGELOG.md (@thebigredgeek) - * Misc: Added license file (#226 #274, @CantemoInternal @sdaitzman) - * Misc: Updated contributors (@thebigredgeek) - -2.2.0 / 2015-05-09 -================== - - * package: update "ms" to v0.7.1 (#202, @dougwilson) - * README: add logging to file example (#193, @DanielOchoa) - * README: fixed a typo (#191, @amir-s) - * browser: expose `storage` (#190, @stephenmathieson) - * Makefile: add a `distclean` target (#189, @stephenmathieson) - -2.1.3 / 2015-03-13 -================== - - * Updated stdout/stderr example (#186) - * Updated example/stdout.js to match debug current behaviour - * Renamed example/stderr.js to stdout.js - * Update Readme.md (#184) - * replace high intensity foreground color for bold (#182, #183) - -2.1.2 / 2015-03-01 -================== - - * dist: recompile - * update "ms" to v0.7.0 - * package: update "browserify" to v9.0.3 - * component: fix "ms.js" repo location - * changed bower package name - * updated documentation about using debug in a browser - * fix: security error on safari (#167, #168, @yields) - -2.1.1 / 2014-12-29 -================== - - * browser: use `typeof` to check for `console` existence - * browser: check for `console.log` truthiness (fix IE 8/9) - * browser: add support for Chrome apps - * Readme: added Windows usage remarks - * Add `bower.json` to properly support bower install - -2.1.0 / 2014-10-15 -================== - - * node: implement `DEBUG_FD` env variable support - * package: update "browserify" to v6.1.0 - * package: add "license" field to package.json (#135, @panuhorsmalahti) - -2.0.0 / 2014-09-01 -================== - - * package: update "browserify" to v5.11.0 - * node: use stderr rather than stdout for logging (#29, @stephenmathieson) - -1.0.4 / 2014-07-15 -================== - - * dist: recompile - * example: remove `console.info()` log usage - * example: add "Content-Type" UTF-8 header to browser example - * browser: place %c marker after the space character - * browser: reset the "content" color via `color: inherit` - * browser: add colors support for Firefox >= v31 - * debug: prefer an instance `log()` function over the global one (#119) - * Readme: update documentation about styled console logs for FF v31 (#116, @wryk) - -1.0.3 / 2014-07-09 -================== - - * Add support for multiple wildcards in namespaces (#122, @seegno) - * browser: fix lint - -1.0.2 / 2014-06-10 -================== - - * browser: update color palette (#113, @gscottolson) - * common: make console logging function configurable (#108, @timoxley) - * node: fix %o colors on old node <= 0.8.x - * Makefile: find node path using shell/which (#109, @timoxley) - -1.0.1 / 2014-06-06 -================== - - * browser: use `removeItem()` to clear localStorage - * browser, node: don't set DEBUG if namespaces is undefined (#107, @leedm777) - * package: add "contributors" section - * node: fix comment typo - * README: list authors - -1.0.0 / 2014-06-04 -================== - - * make ms diff be global, not be scope - * debug: ignore empty strings in enable() - * node: make DEBUG_COLORS able to disable coloring - * *: export the `colors` array - * npmignore: don't publish the `dist` dir - * Makefile: refactor to use browserify - * package: add "browserify" as a dev dependency - * Readme: add Web Inspector Colors section - * node: reset terminal color for the debug content - * node: map "%o" to `util.inspect()` - * browser: map "%j" to `JSON.stringify()` - * debug: add custom "formatters" - * debug: use "ms" module for humanizing the diff - * Readme: add "bash" syntax highlighting - * browser: add Firebug color support - * browser: add colors for WebKit browsers - * node: apply log to `console` - * rewrite: abstract common logic for Node & browsers - * add .jshintrc file - -0.8.1 / 2014-04-14 -================== - - * package: re-add the "component" section - -0.8.0 / 2014-03-30 -================== - - * add `enable()` method for nodejs. Closes #27 - * change from stderr to stdout - * remove unnecessary index.js file - -0.7.4 / 2013-11-13 -================== - - * remove "browserify" key from package.json (fixes something in browserify) - -0.7.3 / 2013-10-30 -================== - - * fix: catch localStorage security error when cookies are blocked (Chrome) - * add debug(err) support. Closes #46 - * add .browser prop to package.json. Closes #42 - -0.7.2 / 2013-02-06 -================== - - * fix package.json - * fix: Mobile Safari (private mode) is broken with debug - * fix: Use unicode to send escape character to shell instead of octal to work with strict mode javascript - -0.7.1 / 2013-02-05 -================== - - * add repository URL to package.json - * add DEBUG_COLORED to force colored output - * add browserify support - * fix component. Closes #24 - -0.7.0 / 2012-05-04 -================== - - * Added .component to package.json - * Added debug.component.js build - -0.6.0 / 2012-03-16 -================== - - * Added support for "-" prefix in DEBUG [Vinay Pulim] - * Added `.enabled` flag to the node version [TooTallNate] - -0.5.0 / 2012-02-02 -================== - - * Added: humanize diffs. Closes #8 - * Added `debug.disable()` to the CS variant - * Removed padding. Closes #10 - * Fixed: persist client-side variant again. Closes #9 - -0.4.0 / 2012-02-01 -================== - - * Added browser variant support for older browsers [TooTallNate] - * Added `debug.enable('project:*')` to browser variant [TooTallNate] - * Added padding to diff (moved it to the right) - -0.3.0 / 2012-01-26 -================== - - * Added millisecond diff when isatty, otherwise UTC string - -0.2.0 / 2012-01-22 -================== - - * Added wildcard support - -0.1.0 / 2011-12-02 -================== - - * Added: remove colors unless stderr isatty [TooTallNate] - -0.0.1 / 2010-01-03 -================== - - * Initial release diff --git a/nodejs/node_modules/send/node_modules/debug/LICENSE b/nodejs/node_modules/send/node_modules/debug/LICENSE deleted file mode 100644 index 658c933d2..000000000 --- a/nodejs/node_modules/send/node_modules/debug/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -(The MIT License) - -Copyright (c) 2014 TJ Holowaychuk - -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/nodejs/node_modules/send/node_modules/debug/Makefile b/nodejs/node_modules/send/node_modules/debug/Makefile deleted file mode 100644 index 584da8bf9..000000000 --- a/nodejs/node_modules/send/node_modules/debug/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# get Makefile directory name: http://stackoverflow.com/a/5982798/376773 -THIS_MAKEFILE_PATH:=$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -THIS_DIR:=$(shell cd $(dir $(THIS_MAKEFILE_PATH));pwd) - -# BIN directory -BIN := $(THIS_DIR)/node_modules/.bin - -# Path -PATH := node_modules/.bin:$(PATH) -SHELL := /bin/bash - -# applications -NODE ?= $(shell which node) -YARN ?= $(shell which yarn) -PKG ?= $(if $(YARN),$(YARN),$(NODE) $(shell which npm)) -BROWSERIFY ?= $(NODE) $(BIN)/browserify - -.FORCE: - -install: node_modules - -node_modules: package.json - @NODE_ENV= $(PKG) install - @touch node_modules - -lint: .FORCE - eslint browser.js debug.js index.js node.js - -test-node: .FORCE - istanbul cover node_modules/mocha/bin/_mocha -- test/**.js - -test-browser: .FORCE - mkdir -p dist - - @$(BROWSERIFY) \ - --standalone debug \ - . > dist/debug.js - - karma start --single-run - rimraf dist - -test: .FORCE - concurrently \ - "make test-node" \ - "make test-browser" - -coveralls: - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js - -.PHONY: all install clean distclean diff --git a/nodejs/node_modules/send/node_modules/debug/README.md b/nodejs/node_modules/send/node_modules/debug/README.md deleted file mode 100644 index 2c57ddfa5..000000000 --- a/nodejs/node_modules/send/node_modules/debug/README.md +++ /dev/null @@ -1,238 +0,0 @@ -# debug -[![Build Status](https://travis-ci.org/visionmedia/debug.svg?branch=master)](https://travis-ci.org/visionmedia/debug) [![Coverage Status](https://coveralls.io/repos/github/visionmedia/debug/badge.svg?branch=master)](https://coveralls.io/github/visionmedia/debug?branch=master) - -A tiny node.js debugging utility modelled after node core's debugging technique. - -**Discussion around the V3 API is under way [here](https://github.com/visionmedia/debug/issues/370)** - -## Installation - -```bash -$ npm install debug -``` - -## Usage - -`debug` exposes a function; simply pass this function the name of your module, and it will return a decorated version of `console.error` for you to pass debug statements to. This will allow you to toggle the debug output for different parts of your module as well as the module as a whole. - -Example _app.js_: - -```js -var debug = require('debug')('http') - , http = require('http') - , name = 'My App'; - -// fake app - -debug('booting %s', name); - -http.createServer(function(req, res){ - debug(req.method + ' ' + req.url); - res.end('hello\n'); -}).listen(3000, function(){ - debug('listening'); -}); - -// fake worker of some kind - -require('./worker'); -``` - -Example _worker.js_: - -```js -var debug = require('debug')('worker'); - -setInterval(function(){ - debug('doing some work'); -}, 1000); -``` - - The __DEBUG__ environment variable is then used to enable these based on space or comma-delimited names. Here are some examples: - - ![debug http and worker](http://f.cl.ly/items/18471z1H402O24072r1J/Screenshot.png) - - ![debug worker](http://f.cl.ly/items/1X413v1a3M0d3C2c1E0i/Screenshot.png) - -#### Windows note - - On Windows the environment variable is set using the `set` command. - - ```cmd - set DEBUG=*,-not_this - ``` - - Note that PowerShell uses different syntax to set environment variables. - - ```cmd - $env:DEBUG = "*,-not_this" - ``` - -Then, run the program to be debugged as usual. - -## Millisecond diff - - When actively developing an application it can be useful to see when the time spent between one `debug()` call and the next. Suppose for example you invoke `debug()` before requesting a resource, and after as well, the "+NNNms" will show you how much time was spent between calls. - - ![](http://f.cl.ly/items/2i3h1d3t121M2Z1A3Q0N/Screenshot.png) - - When stdout is not a TTY, `Date#toUTCString()` is used, making it more useful for logging the debug information as shown below: - - ![](http://f.cl.ly/items/112H3i0e0o0P0a2Q2r11/Screenshot.png) - -## Conventions - - If you're using this in one or more of your libraries, you _should_ use the name of your library so that developers may toggle debugging as desired without guessing names. If you have more than one debuggers you _should_ prefix them with your library name and use ":" to separate features. For example "bodyParser" from Connect would then be "connect:bodyParser". - -## Wildcards - - The `*` character may be used as a wildcard. Suppose for example your library has debuggers named "connect:bodyParser", "connect:compress", "connect:session", instead of listing all three with `DEBUG=connect:bodyParser,connect:compress,connect:session`, you may simply do `DEBUG=connect:*`, or to run everything using this module simply use `DEBUG=*`. - - You can also exclude specific debuggers by prefixing them with a "-" character. For example, `DEBUG=*,-connect:*` would include all debuggers except those starting with "connect:". - -## Environment Variables - - When running through Node.js, you can set a few environment variables that will - change the behavior of the debug logging: - -| Name | Purpose | -|-----------|-------------------------------------------------| -| `DEBUG` | Enables/disabled specific debugging namespaces. | -| `DEBUG_COLORS`| Whether or not to use colors in the debug output. | -| `DEBUG_DEPTH` | Object inspection depth. | -| `DEBUG_SHOW_HIDDEN` | Shows hidden properties on inspected objects. | - - - __Note:__ The environment variables beginning with `DEBUG_` end up being - converted into an Options object that gets used with `%o`/`%O` formatters. - See the Node.js documentation for - [`util.inspect()`](https://nodejs.org/api/util.html#util_util_inspect_object_options) - for the complete list. - -## Formatters - - - Debug uses [printf-style](https://wikipedia.org/wiki/Printf_format_string) formatting. Below are the officially supported formatters: - -| Formatter | Representation | -|-----------|----------------| -| `%O` | Pretty-print an Object on multiple lines. | -| `%o` | Pretty-print an Object all on a single line. | -| `%s` | String. | -| `%d` | Number (both integer and float). | -| `%j` | JSON. Replaced with the string '[Circular]' if the argument contains circular references. | -| `%%` | Single percent sign ('%'). This does not consume an argument. | - -### Custom formatters - - You can add custom formatters by extending the `debug.formatters` object. For example, if you wanted to add support for rendering a Buffer as hex with `%h`, you could do something like: - -```js -const createDebug = require('debug') -createDebug.formatters.h = (v) => { - return v.toString('hex') -} - -// …elsewhere -const debug = createDebug('foo') -debug('this is hex: %h', new Buffer('hello world')) -// foo this is hex: 68656c6c6f20776f726c6421 +0ms -``` - -## Browser support - You can build a browser-ready script using [browserify](https://github.com/substack/node-browserify), - or just use the [browserify-as-a-service](https://wzrd.in/) [build](https://wzrd.in/standalone/debug@latest), - if you don't want to build it yourself. - - Debug's enable state is currently persisted by `localStorage`. - Consider the situation shown below where you have `worker:a` and `worker:b`, - and wish to debug both. You can enable this using `localStorage.debug`: - -```js -localStorage.debug = 'worker:*' -``` - -And then refresh the page. - -```js -a = debug('worker:a'); -b = debug('worker:b'); - -setInterval(function(){ - a('doing some work'); -}, 1000); - -setInterval(function(){ - b('doing some work'); -}, 1200); -``` - -#### Web Inspector Colors - - Colors are also enabled on "Web Inspectors" that understand the `%c` formatting - option. These are WebKit web inspectors, Firefox ([since version - 31](https://hacks.mozilla.org/2014/05/editable-box-model-multiple-selection-sublime-text-keys-much-more-firefox-developer-tools-episode-31/)) - and the Firebug plugin for Firefox (any version). - - Colored output looks something like: - - ![](https://cloud.githubusercontent.com/assets/71256/3139768/b98c5fd8-e8ef-11e3-862a-f7253b6f47c6.png) - - -## Output streams - - By default `debug` will log to stderr, however this can be configured per-namespace by overriding the `log` method: - -Example _stdout.js_: - -```js -var debug = require('debug'); -var error = debug('app:error'); - -// by default stderr is used -error('goes to stderr!'); - -var log = debug('app:log'); -// set this namespace to log via console.log -log.log = console.log.bind(console); // don't forget to bind to console! -log('goes to stdout'); -error('still goes to stderr!'); - -// set all output to go via console.info -// overrides all per-namespace log settings -debug.log = console.info.bind(console); -error('now goes to stdout via console.info'); -log('still goes to stdout, but via console.info now'); -``` - - -## Authors - - - TJ Holowaychuk - - Nathan Rajlich - - Andrew Rhyne - -## License - -(The MIT License) - -Copyright (c) 2014-2016 TJ Holowaychuk <tj@vision-media.ca> - -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/nodejs/node_modules/send/node_modules/debug/bower.json b/nodejs/node_modules/send/node_modules/debug/bower.json deleted file mode 100644 index 027804ce0..000000000 --- a/nodejs/node_modules/send/node_modules/debug/bower.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "visionmedia-debug", - "main": "./src/browser.js", - "homepage": "https://github.com/visionmedia/debug", - "authors": [ - "TJ Holowaychuk ", - "Nathan Rajlich (http://n8.io)", - "Andrew Rhyne " - ], - "description": "visionmedia-debug", - "moduleType": [ - "amd", - "es6", - "globals", - "node" - ], - "keywords": [ - "visionmedia", - "debug" - ], - "license": "MIT", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ] -} diff --git a/nodejs/node_modules/send/node_modules/debug/component.json b/nodejs/node_modules/send/node_modules/debug/component.json deleted file mode 100644 index 4861027d4..000000000 --- a/nodejs/node_modules/send/node_modules/debug/component.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "debug", - "repo": "visionmedia/debug", - "description": "small debugging utility", - "version": "2.6.1", - "keywords": [ - "debug", - "log", - "debugger" - ], - "main": "src/browser.js", - "scripts": [ - "src/browser.js", - "src/debug.js" - ], - "dependencies": { - "rauchg/ms.js": "0.7.1" - } -} diff --git a/nodejs/node_modules/send/node_modules/debug/karma.conf.js b/nodejs/node_modules/send/node_modules/debug/karma.conf.js deleted file mode 100644 index 103a82d15..000000000 --- a/nodejs/node_modules/send/node_modules/debug/karma.conf.js +++ /dev/null @@ -1,70 +0,0 @@ -// Karma configuration -// Generated on Fri Dec 16 2016 13:09:51 GMT+0000 (UTC) - -module.exports = function(config) { - config.set({ - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '', - - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['mocha', 'chai', 'sinon'], - - - // list of files / patterns to load in the browser - files: [ - 'dist/debug.js', - 'test/*spec.js' - ], - - - // list of files to exclude - exclude: [ - 'src/node.js' - ], - - - // preprocess matching files before serving them to the browser - // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor - preprocessors: { - }, - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['progress'], - - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: true, - - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: ['PhantomJS'], - - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: false, - - // Concurrency level - // how many browser should be started simultaneous - concurrency: Infinity - }) -} diff --git a/nodejs/node_modules/send/node_modules/debug/node.js b/nodejs/node_modules/send/node_modules/debug/node.js deleted file mode 100644 index 7fc36fe6d..000000000 --- a/nodejs/node_modules/send/node_modules/debug/node.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./src/node'); diff --git a/nodejs/node_modules/send/node_modules/debug/package.json b/nodejs/node_modules/send/node_modules/debug/package.json deleted file mode 100644 index f3abefb3c..000000000 --- a/nodejs/node_modules/send/node_modules/debug/package.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "_args": [ - [ - { - "raw": "debug@2.6.1", - "scope": null, - "escapedName": "debug", - "name": "debug", - "rawSpec": "2.6.1", - "spec": "2.6.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/send" - ] - ], - "_from": "debug@2.6.1", - "_id": "debug@2.6.1", - "_inCache": true, - "_location": "/send/debug", - "_nodeVersion": "6.9.0", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/debug-2.6.1.tgz_1486753226738_0.07569954148493707" - }, - "_npmUser": { - "name": "thebigredgeek", - "email": "rhyneandrew@gmail.com" - }, - "_npmVersion": "4.0.3", - "_phantomChildren": {}, - "_requested": { - "raw": "debug@2.6.1", - "scope": null, - "escapedName": "debug", - "name": "debug", - "rawSpec": "2.6.1", - "spec": "2.6.1", - "type": "version" - }, - "_requiredBy": [ - "/send" - ], - "_resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz", - "_shasum": "79855090ba2c4e3115cc7d8769491d58f0491351", - "_shrinkwrap": null, - "_spec": "debug@2.6.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/send", - "author": { - "name": "TJ Holowaychuk", - "email": "tj@vision-media.ca" - }, - "browser": "./src/browser.js", - "bugs": { - "url": "https://github.com/visionmedia/debug/issues" - }, - "component": { - "scripts": { - "debug/index.js": "browser.js", - "debug/debug.js": "debug.js" - } - }, - "contributors": [ - { - "name": "Nathan Rajlich", - "email": "nathan@tootallnate.net", - "url": "http://n8.io" - }, - { - "name": "Andrew Rhyne", - "email": "rhyneandrew@gmail.com" - } - ], - "dependencies": { - "ms": "0.7.2" - }, - "description": "small debugging utility", - "devDependencies": { - "browserify": "9.0.3", - "chai": "^3.5.0", - "concurrently": "^3.1.0", - "coveralls": "^2.11.15", - "eslint": "^3.12.1", - "istanbul": "^0.4.5", - "karma": "^1.3.0", - "karma-chai": "^0.1.0", - "karma-mocha": "^1.3.0", - "karma-phantomjs-launcher": "^1.0.2", - "karma-sinon": "^1.0.5", - "mocha": "^3.2.0", - "mocha-lcov-reporter": "^1.2.0", - "rimraf": "^2.5.4", - "sinon": "^1.17.6", - "sinon-chai": "^2.8.0" - }, - "directories": {}, - "dist": { - "shasum": "79855090ba2c4e3115cc7d8769491d58f0491351", - "tarball": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz" - }, - "gitHead": "941653e3334e9e3e2cca87cad9bbf6c5cb245215", - "homepage": "https://github.com/visionmedia/debug#readme", - "keywords": [ - "debug", - "log", - "debugger" - ], - "license": "MIT", - "main": "./src/index.js", - "maintainers": [ - { - "name": "thebigredgeek", - "email": "rhyneandrew@gmail.com" - } - ], - "name": "debug", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", - "repository": { - "type": "git", - "url": "git://github.com/visionmedia/debug.git" - }, - "scripts": {}, - "version": "2.6.1" -} diff --git a/nodejs/node_modules/send/node_modules/debug/src/browser.js b/nodejs/node_modules/send/node_modules/debug/src/browser.js deleted file mode 100644 index 38d6391e3..000000000 --- a/nodejs/node_modules/send/node_modules/debug/src/browser.js +++ /dev/null @@ -1,182 +0,0 @@ -/** - * This is the web browser implementation of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = require('./debug'); -exports.log = log; -exports.formatArgs = formatArgs; -exports.save = save; -exports.load = load; -exports.useColors = useColors; -exports.storage = 'undefined' != typeof chrome - && 'undefined' != typeof chrome.storage - ? chrome.storage.local - : localstorage(); - -/** - * Colors. - */ - -exports.colors = [ - 'lightseagreen', - 'forestgreen', - 'goldenrod', - 'dodgerblue', - 'darkorchid', - 'crimson' -]; - -/** - * Currently only WebKit-based Web Inspectors, Firefox >= v31, - * and the Firebug extension (any Firefox version) are known - * to support "%c" CSS customizations. - * - * TODO: add a `localStorage` variable to explicitly enable/disable colors - */ - -function useColors() { - // NB: In an Electron preload script, document will be defined but not fully - // initialized. Since we know we're in Chrome, we'll just detect this case - // explicitly - if (typeof window !== 'undefined' && window && typeof window.process !== 'undefined' && window.process.type === 'renderer') { - return true; - } - - // is webkit? http://stackoverflow.com/a/16459606/376773 - // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632 - return (typeof document !== 'undefined' && document && 'WebkitAppearance' in document.documentElement.style) || - // is firebug? http://stackoverflow.com/a/398120/376773 - (typeof window !== 'undefined' && window && window.console && (console.firebug || (console.exception && console.table))) || - // is firefox >= v31? - // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages - (typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) || - // double check webkit in userAgent just in case we are in a worker - (typeof navigator !== 'undefined' && navigator && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/)); -} - -/** - * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default. - */ - -exports.formatters.j = function(v) { - try { - return JSON.stringify(v); - } catch (err) { - return '[UnexpectedJSONParseError]: ' + err.message; - } -}; - - -/** - * Colorize log arguments if enabled. - * - * @api public - */ - -function formatArgs(args) { - var useColors = this.useColors; - - args[0] = (useColors ? '%c' : '') - + this.namespace - + (useColors ? ' %c' : ' ') - + args[0] - + (useColors ? '%c ' : ' ') - + '+' + exports.humanize(this.diff); - - if (!useColors) return; - - var c = 'color: ' + this.color; - args.splice(1, 0, c, 'color: inherit') - - // the final "%c" is somewhat tricky, because there could be other - // arguments passed either before or after the %c, so we need to - // figure out the correct index to insert the CSS into - var index = 0; - var lastC = 0; - args[0].replace(/%[a-zA-Z%]/g, function(match) { - if ('%%' === match) return; - index++; - if ('%c' === match) { - // we only are interested in the *last* %c - // (the user may have provided their own) - lastC = index; - } - }); - - args.splice(lastC, 0, c); -} - -/** - * Invokes `console.log()` when available. - * No-op when `console.log` is not a "function". - * - * @api public - */ - -function log() { - // this hackery is required for IE8/9, where - // the `console.log` function doesn't have 'apply' - return 'object' === typeof console - && console.log - && Function.prototype.apply.call(console.log, console, arguments); -} - -/** - * Save `namespaces`. - * - * @param {String} namespaces - * @api private - */ - -function save(namespaces) { - try { - if (null == namespaces) { - exports.storage.removeItem('debug'); - } else { - exports.storage.debug = namespaces; - } - } catch(e) {} -} - -/** - * Load `namespaces`. - * - * @return {String} returns the previously persisted debug modes - * @api private - */ - -function load() { - try { - return exports.storage.debug; - } catch(e) {} - - // If debug isn't set in LS, and we're in Electron, try to load $DEBUG - if (typeof process !== 'undefined' && 'env' in process) { - return process.env.DEBUG; - } -} - -/** - * Enable namespaces listed in `localStorage.debug` initially. - */ - -exports.enable(load()); - -/** - * Localstorage attempts to return the localstorage. - * - * This is necessary because safari throws - * when a user disables cookies/localstorage - * and you attempt to access it. - * - * @return {LocalStorage} - * @api private - */ - -function localstorage() { - try { - return window.localStorage; - } catch (e) {} -} diff --git a/nodejs/node_modules/send/node_modules/debug/src/debug.js b/nodejs/node_modules/send/node_modules/debug/src/debug.js deleted file mode 100644 index d5d6d1670..000000000 --- a/nodejs/node_modules/send/node_modules/debug/src/debug.js +++ /dev/null @@ -1,202 +0,0 @@ - -/** - * This is the common logic for both the Node.js and web browser - * implementations of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = createDebug.debug = createDebug['default'] = createDebug; -exports.coerce = coerce; -exports.disable = disable; -exports.enable = enable; -exports.enabled = enabled; -exports.humanize = require('ms'); - -/** - * The currently active debug mode names, and names to skip. - */ - -exports.names = []; -exports.skips = []; - -/** - * Map of special "%n" handling functions, for the debug "format" argument. - * - * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N". - */ - -exports.formatters = {}; - -/** - * Previous log timestamp. - */ - -var prevTime; - -/** - * Select a color. - * @param {String} namespace - * @return {Number} - * @api private - */ - -function selectColor(namespace) { - var hash = 0, i; - - for (i in namespace) { - hash = ((hash << 5) - hash) + namespace.charCodeAt(i); - hash |= 0; // Convert to 32bit integer - } - - return exports.colors[Math.abs(hash) % exports.colors.length]; -} - -/** - * Create a debugger with the given `namespace`. - * - * @param {String} namespace - * @return {Function} - * @api public - */ - -function createDebug(namespace) { - - function debug() { - // disabled? - if (!debug.enabled) return; - - var self = debug; - - // set `diff` timestamp - var curr = +new Date(); - var ms = curr - (prevTime || curr); - self.diff = ms; - self.prev = prevTime; - self.curr = curr; - prevTime = curr; - - // turn the `arguments` into a proper Array - var args = new Array(arguments.length); - for (var i = 0; i < args.length; i++) { - args[i] = arguments[i]; - } - - args[0] = exports.coerce(args[0]); - - if ('string' !== typeof args[0]) { - // anything else let's inspect with %O - args.unshift('%O'); - } - - // apply any `formatters` transformations - var index = 0; - args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) { - // if we encounter an escaped % then don't increase the array index - if (match === '%%') return match; - index++; - var formatter = exports.formatters[format]; - if ('function' === typeof formatter) { - var val = args[index]; - match = formatter.call(self, val); - - // now we need to remove `args[index]` since it's inlined in the `format` - args.splice(index, 1); - index--; - } - return match; - }); - - // apply env-specific formatting (colors, etc.) - exports.formatArgs.call(self, args); - - var logFn = debug.log || exports.log || console.log.bind(console); - logFn.apply(self, args); - } - - debug.namespace = namespace; - debug.enabled = exports.enabled(namespace); - debug.useColors = exports.useColors(); - debug.color = selectColor(namespace); - - // env-specific initialization logic for debug instances - if ('function' === typeof exports.init) { - exports.init(debug); - } - - return debug; -} - -/** - * Enables a debug mode by namespaces. This can include modes - * separated by a colon and wildcards. - * - * @param {String} namespaces - * @api public - */ - -function enable(namespaces) { - exports.save(namespaces); - - exports.names = []; - exports.skips = []; - - var split = (namespaces || '').split(/[\s,]+/); - var len = split.length; - - for (var i = 0; i < len; i++) { - if (!split[i]) continue; // ignore empty strings - namespaces = split[i].replace(/\*/g, '.*?'); - if (namespaces[0] === '-') { - exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$')); - } else { - exports.names.push(new RegExp('^' + namespaces + '$')); - } - } -} - -/** - * Disable debug output. - * - * @api public - */ - -function disable() { - exports.enable(''); -} - -/** - * Returns true if the given mode name is enabled, false otherwise. - * - * @param {String} name - * @return {Boolean} - * @api public - */ - -function enabled(name) { - var i, len; - for (i = 0, len = exports.skips.length; i < len; i++) { - if (exports.skips[i].test(name)) { - return false; - } - } - for (i = 0, len = exports.names.length; i < len; i++) { - if (exports.names[i].test(name)) { - return true; - } - } - return false; -} - -/** - * Coerce `val`. - * - * @param {Mixed} val - * @return {Mixed} - * @api private - */ - -function coerce(val) { - if (val instanceof Error) return val.stack || val.message; - return val; -} diff --git a/nodejs/node_modules/send/node_modules/debug/src/index.js b/nodejs/node_modules/send/node_modules/debug/src/index.js deleted file mode 100644 index e12cf4d58..000000000 --- a/nodejs/node_modules/send/node_modules/debug/src/index.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Detect Electron renderer process, which is node, but we should - * treat as a browser. - */ - -if (typeof process !== 'undefined' && process.type === 'renderer') { - module.exports = require('./browser.js'); -} else { - module.exports = require('./node.js'); -} diff --git a/nodejs/node_modules/send/node_modules/debug/src/node.js b/nodejs/node_modules/send/node_modules/debug/src/node.js deleted file mode 100644 index 4fa564b0d..000000000 --- a/nodejs/node_modules/send/node_modules/debug/src/node.js +++ /dev/null @@ -1,241 +0,0 @@ -/** - * Module dependencies. - */ - -var tty = require('tty'); -var util = require('util'); - -/** - * This is the Node.js implementation of `debug()`. - * - * Expose `debug()` as the module. - */ - -exports = module.exports = require('./debug'); -exports.init = init; -exports.log = log; -exports.formatArgs = formatArgs; -exports.save = save; -exports.load = load; -exports.useColors = useColors; - -/** - * Colors. - */ - -exports.colors = [6, 2, 3, 4, 5, 1]; - -/** - * Build up the default `inspectOpts` object from the environment variables. - * - * $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js - */ - -exports.inspectOpts = Object.keys(process.env).filter(function (key) { - return /^debug_/i.test(key); -}).reduce(function (obj, key) { - // camel-case - var prop = key - .substring(6) - .toLowerCase() - .replace(/_([a-z])/, function (_, k) { return k.toUpperCase() }); - - // coerce string value into JS value - var val = process.env[key]; - if (/^(yes|on|true|enabled)$/i.test(val)) val = true; - else if (/^(no|off|false|disabled)$/i.test(val)) val = false; - else if (val === 'null') val = null; - else val = Number(val); - - obj[prop] = val; - return obj; -}, {}); - -/** - * The file descriptor to write the `debug()` calls to. - * Set the `DEBUG_FD` env variable to override with another value. i.e.: - * - * $ DEBUG_FD=3 node script.js 3>debug.log - */ - -var fd = parseInt(process.env.DEBUG_FD, 10) || 2; - -if (1 !== fd && 2 !== fd) { - util.deprecate(function(){}, 'except for stderr(2) and stdout(1), any other usage of DEBUG_FD is deprecated. Override debug.log if you want to use a different log function (https://git.io/debug_fd)')() -} - -var stream = 1 === fd ? process.stdout : - 2 === fd ? process.stderr : - createWritableStdioStream(fd); - -/** - * Is stdout a TTY? Colored output is enabled when `true`. - */ - -function useColors() { - return 'colors' in exports.inspectOpts - ? Boolean(exports.inspectOpts.colors) - : tty.isatty(fd); -} - -/** - * Map %o to `util.inspect()`, all on a single line. - */ - -exports.formatters.o = function(v) { - this.inspectOpts.colors = this.useColors; - return util.inspect(v, this.inspectOpts) - .replace(/\s*\n\s*/g, ' '); -}; - -/** - * Map %o to `util.inspect()`, allowing multiple lines if needed. - */ - -exports.formatters.O = function(v) { - this.inspectOpts.colors = this.useColors; - return util.inspect(v, this.inspectOpts); -}; - -/** - * Adds ANSI color escape codes if enabled. - * - * @api public - */ - -function formatArgs(args) { - var name = this.namespace; - var useColors = this.useColors; - - if (useColors) { - var c = this.color; - var prefix = ' \u001b[3' + c + ';1m' + name + ' ' + '\u001b[0m'; - - args[0] = prefix + args[0].split('\n').join('\n' + prefix); - args.push('\u001b[3' + c + 'm+' + exports.humanize(this.diff) + '\u001b[0m'); - } else { - args[0] = new Date().toUTCString() - + ' ' + name + ' ' + args[0]; - } -} - -/** - * Invokes `util.format()` with the specified arguments and writes to `stream`. - */ - -function log() { - return stream.write(util.format.apply(util, arguments) + '\n'); -} - -/** - * Save `namespaces`. - * - * @param {String} namespaces - * @api private - */ - -function save(namespaces) { - if (null == namespaces) { - // If you set a process.env field to null or undefined, it gets cast to the - // string 'null' or 'undefined'. Just delete instead. - delete process.env.DEBUG; - } else { - process.env.DEBUG = namespaces; - } -} - -/** - * Load `namespaces`. - * - * @return {String} returns the previously persisted debug modes - * @api private - */ - -function load() { - return process.env.DEBUG; -} - -/** - * Copied from `node/src/node.js`. - * - * XXX: It's lame that node doesn't expose this API out-of-the-box. It also - * relies on the undocumented `tty_wrap.guessHandleType()` which is also lame. - */ - -function createWritableStdioStream (fd) { - var stream; - var tty_wrap = process.binding('tty_wrap'); - - // Note stream._type is used for test-module-load-list.js - - switch (tty_wrap.guessHandleType(fd)) { - case 'TTY': - stream = new tty.WriteStream(fd); - stream._type = 'tty'; - - // Hack to have stream not keep the event loop alive. - // See https://github.com/joyent/node/issues/1726 - if (stream._handle && stream._handle.unref) { - stream._handle.unref(); - } - break; - - case 'FILE': - var fs = require('fs'); - stream = new fs.SyncWriteStream(fd, { autoClose: false }); - stream._type = 'fs'; - break; - - case 'PIPE': - case 'TCP': - var net = require('net'); - stream = new net.Socket({ - fd: fd, - readable: false, - writable: true - }); - - // FIXME Should probably have an option in net.Socket to create a - // stream from an existing fd which is writable only. But for now - // we'll just add this hack and set the `readable` member to false. - // Test: ./node test/fixtures/echo.js < /etc/passwd - stream.readable = false; - stream.read = null; - stream._type = 'pipe'; - - // FIXME Hack to have stream not keep the event loop alive. - // See https://github.com/joyent/node/issues/1726 - if (stream._handle && stream._handle.unref) { - stream._handle.unref(); - } - break; - - default: - // Probably an error on in uv_guess_handle() - throw new Error('Implement me. Unknown stream file type!'); - } - - // For supporting legacy API we put the FD here. - stream.fd = fd; - - stream._isStdio = true; - - return stream; -} - -/** - * Init logic for `debug` instances. - * - * Create a new `inspectOpts` object in case `useColors` is set - * differently for a particular `debug` instance. - */ - -function init (debug) { - debug.inspectOpts = util._extend({}, exports.inspectOpts); -} - -/** - * Enable namespaces listed in `process.env.DEBUG` initially. - */ - -exports.enable(load()); diff --git a/nodejs/node_modules/send/node_modules/ms/README.md b/nodejs/node_modules/send/node_modules/ms/README.md deleted file mode 100644 index 5b475707d..000000000 --- a/nodejs/node_modules/send/node_modules/ms/README.md +++ /dev/null @@ -1,52 +0,0 @@ -# ms - -[![Build Status](https://travis-ci.org/zeit/ms.svg?branch=master)](https://travis-ci.org/zeit/ms) -[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo) -[![Slack Channel](https://zeit-slackin.now.sh/badge.svg)](https://zeit.chat/) - -Use this package to easily convert various time formats to milliseconds. - -## Examples - -```js -ms('2 days') // 172800000 -ms('1d') // 86400000 -ms('10h') // 36000000 -ms('2.5 hrs') // 9000000 -ms('2h') // 7200000 -ms('1m') // 60000 -ms('5s') // 5000 -ms('1y') // 31557600000 -ms('100') // 100 -``` - -### Convert from milliseconds - -```js -ms(60000) // "1m" -ms(2 * 60000) // "2m" -ms(ms('10 hours')) // "10h" -``` - -### Time format written-out - -```js -ms(60000, { long: true }) // "1 minute" -ms(2 * 60000, { long: true }) // "2 minutes" -ms(ms('10 hours'), { long: true }) // "10 hours" -``` - -## Features - -- Works both in [node](https://nodejs.org) and in the browser. -- If a number is supplied to `ms`, a string with a unit is returned. -- If a string that contains the number is supplied, it returns it as a number (e.g.: it returns `100` for `'100'`). -- If you pass a string with a number and a valid unit, the number of equivalent ms is returned. - -## Caught a bug? - -1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device -2. Link the package to the global module directory: `npm link` -3. Within the module you want to test your local development instance of ms, just link it to the dependencies: `npm link ms`. Instead of the default one from npm, node will now use your clone of ms! - -As always, you can run the tests using: `npm test` diff --git a/nodejs/node_modules/send/node_modules/ms/index.js b/nodejs/node_modules/send/node_modules/ms/index.js deleted file mode 100644 index 824b37eba..000000000 --- a/nodejs/node_modules/send/node_modules/ms/index.js +++ /dev/null @@ -1,149 +0,0 @@ -/** - * Helpers. - */ - -var s = 1000 -var m = s * 60 -var h = m * 60 -var d = h * 24 -var y = d * 365.25 - -/** - * Parse or format the given `val`. - * - * Options: - * - * - `long` verbose formatting [false] - * - * @param {String|Number} val - * @param {Object} options - * @throws {Error} throw an error if val is not a non-empty string or a number - * @return {String|Number} - * @api public - */ - -module.exports = function (val, options) { - options = options || {} - var type = typeof val - if (type === 'string' && val.length > 0) { - return parse(val) - } else if (type === 'number' && isNaN(val) === false) { - return options.long ? - fmtLong(val) : - fmtShort(val) - } - throw new Error('val is not a non-empty string or a valid number. val=' + JSON.stringify(val)) -} - -/** - * Parse the given `str` and return milliseconds. - * - * @param {String} str - * @return {Number} - * @api private - */ - -function parse(str) { - str = String(str) - if (str.length > 10000) { - return - } - var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str) - if (!match) { - return - } - var n = parseFloat(match[1]) - var type = (match[2] || 'ms').toLowerCase() - switch (type) { - case 'years': - case 'year': - case 'yrs': - case 'yr': - case 'y': - return n * y - case 'days': - case 'day': - case 'd': - return n * d - case 'hours': - case 'hour': - case 'hrs': - case 'hr': - case 'h': - return n * h - case 'minutes': - case 'minute': - case 'mins': - case 'min': - case 'm': - return n * m - case 'seconds': - case 'second': - case 'secs': - case 'sec': - case 's': - return n * s - case 'milliseconds': - case 'millisecond': - case 'msecs': - case 'msec': - case 'ms': - return n - default: - return undefined - } -} - -/** - * Short format for `ms`. - * - * @param {Number} ms - * @return {String} - * @api private - */ - -function fmtShort(ms) { - if (ms >= d) { - return Math.round(ms / d) + 'd' - } - if (ms >= h) { - return Math.round(ms / h) + 'h' - } - if (ms >= m) { - return Math.round(ms / m) + 'm' - } - if (ms >= s) { - return Math.round(ms / s) + 's' - } - return ms + 'ms' -} - -/** - * Long format for `ms`. - * - * @param {Number} ms - * @return {String} - * @api private - */ - -function fmtLong(ms) { - return plural(ms, d, 'day') || - plural(ms, h, 'hour') || - plural(ms, m, 'minute') || - plural(ms, s, 'second') || - ms + ' ms' -} - -/** - * Pluralization helper. - */ - -function plural(ms, n, name) { - if (ms < n) { - return - } - if (ms < n * 1.5) { - return Math.floor(ms / n) + ' ' + name - } - return Math.ceil(ms / n) + ' ' + name + 's' -} diff --git a/nodejs/node_modules/send/node_modules/ms/package.json b/nodejs/node_modules/send/node_modules/ms/package.json deleted file mode 100644 index 5a3c4550e..000000000 --- a/nodejs/node_modules/send/node_modules/ms/package.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "_args": [ - [ - { - "raw": "ms@0.7.2", - "scope": null, - "escapedName": "ms", - "name": "ms", - "rawSpec": "0.7.2", - "spec": "0.7.2", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/send" - ] - ], - "_from": "ms@0.7.2", - "_id": "ms@0.7.2", - "_inCache": true, - "_location": "/send/ms", - "_nodeVersion": "6.8.0", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/ms-0.7.2.tgz_1477383407940_0.4743474116548896" - }, - "_npmUser": { - "name": "leo", - "email": "leo@zeit.co" - }, - "_npmVersion": "3.10.8", - "_phantomChildren": {}, - "_requested": { - "raw": "ms@0.7.2", - "scope": null, - "escapedName": "ms", - "name": "ms", - "rawSpec": "0.7.2", - "spec": "0.7.2", - "type": "version" - }, - "_requiredBy": [ - "/send", - "/send/debug" - ], - "_resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", - "_shasum": "ae25cf2512b3885a1d95d7f037868d8431124765", - "_shrinkwrap": null, - "_spec": "ms@0.7.2", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/send", - "bugs": { - "url": "https://github.com/zeit/ms/issues" - }, - "component": { - "scripts": { - "ms/index.js": "index.js" - } - }, - "dependencies": {}, - "description": "Tiny milisecond conversion utility", - "devDependencies": { - "expect.js": "^0.3.1", - "mocha": "^3.0.2", - "serve": "^1.4.0", - "xo": "^0.17.0" - }, - "directories": {}, - "dist": { - "shasum": "ae25cf2512b3885a1d95d7f037868d8431124765", - "tarball": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz" - }, - "files": [ - "index.js" - ], - "gitHead": "ac92a7e0790ba2622a74d9d60690ca0d2c070a45", - "homepage": "https://github.com/zeit/ms#readme", - "license": "MIT", - "main": "./index", - "maintainers": [ - { - "name": "leo", - "email": "leo@zeit.co" - }, - { - "name": "rauchg", - "email": "rauchg@gmail.com" - } - ], - "name": "ms", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", - "repository": { - "type": "git", - "url": "git+https://github.com/zeit/ms.git" - }, - "scripts": { - "test": "xo && mocha test/index.js", - "test-browser": "serve ./test" - }, - "version": "0.7.2", - "xo": { - "space": true, - "semicolon": false, - "envs": [ - "mocha" - ], - "rules": { - "complexity": 0 - } - } -} diff --git a/nodejs/node_modules/send/package.json b/nodejs/node_modules/send/package.json index 70304bdd1..81b07fa40 100644 --- a/nodejs/node_modules/send/package.json +++ b/nodejs/node_modules/send/package.json @@ -1,51 +1,33 @@ { "_args": [ [ - { - "raw": "send@0.15.1", - "scope": null, - "escapedName": "send", - "name": "send", - "rawSpec": "0.15.1", - "spec": "0.15.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "send@0.16.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "send@0.15.1", - "_id": "send@0.15.1", - "_inCache": true, + "_from": "send@0.16.1", + "_id": "send@0.16.1", + "_inBundle": false, + "_integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", "_location": "/send", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/send-0.15.1.tgz_1488683436582_0.6725058956071734" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "send@0.15.1", - "scope": null, - "escapedName": "send", + "type": "version", + "registry": true, + "raw": "send@0.16.1", "name": "send", - "rawSpec": "0.15.1", - "spec": "0.15.1", - "type": "version" + "escapedName": "send", + "rawSpec": "0.16.1", + "saveSpec": null, + "fetchSpec": "0.16.1" }, "_requiredBy": [ "/express", "/serve-static" ], - "_resolved": "https://registry.npmjs.org/send/-/send-0.15.1.tgz", - "_shasum": "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f", - "_shrinkwrap": null, - "_spec": "send@0.15.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", + "_spec": "0.16.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" @@ -68,16 +50,16 @@ } ], "dependencies": { - "debug": "2.6.1", - "depd": "~1.1.0", + "debug": "2.6.9", + "depd": "~1.1.1", "destroy": "~1.0.4", "encodeurl": "~1.0.1", "escape-html": "~1.0.3", - "etag": "~1.8.0", - "fresh": "0.5.0", - "http-errors": "~1.6.1", - "mime": "1.3.4", - "ms": "0.7.2", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.6.2", + "mime": "1.4.1", + "ms": "2.0.0", "on-finished": "~2.3.0", "range-parser": "~1.2.0", "statuses": "~1.3.1" @@ -85,20 +67,17 @@ "description": "Better streaming static file server with Range and conditional-GET support", "devDependencies": { "after": "0.8.2", - "eslint": "3.17.0", - "eslint-config-standard": "7.0.0", - "eslint-plugin-markdown": "1.0.0-beta.4", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.2.0", "eslint-plugin-promise": "3.5.0", - "eslint-plugin-standard": "2.1.1", + "eslint-plugin-standard": "3.0.1", "istanbul": "0.4.5", "mocha": "2.5.3", "supertest": "1.1.0" }, - "directories": {}, - "dist": { - "shasum": "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f", - "tarball": "https://registry.npmjs.org/send/-/send-0.15.1.tgz" - }, "engines": { "node": ">= 0.8.0" }, @@ -108,7 +87,6 @@ "README.md", "index.js" ], - "gitHead": "ea1748a3b3e00dbcbb0629cf368ced575c6ab7d6", "homepage": "https://github.com/pillarjs/send#readme", "keywords": [ "static", @@ -116,15 +94,7 @@ "server" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "send", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/pillarjs/send.git" @@ -135,5 +105,5 @@ "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --check-leaks --reporter spec", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --check-leaks --reporter dot" }, - "version": "0.15.1" + "version": "0.16.1" } diff --git a/nodejs/node_modules/serve-static/HISTORY.md b/nodejs/node_modules/serve-static/HISTORY.md index 434737d35..d41d5f53e 100644 --- a/nodejs/node_modules/serve-static/HISTORY.md +++ b/nodejs/node_modules/serve-static/HISTORY.md @@ -1,3 +1,60 @@ +1.13.1 / 2017-09-29 +=================== + + * Fix regression when `root` is incorrectly set to a file + * deps: send@0.16.1 + +1.13.0 / 2017-09-27 +=================== + + * deps: send@0.16.0 + - Add 70 new types for file extensions + - Add `immutable` option + - Fix missing `` in default error & redirects + - Set charset as "UTF-8" for .js and .json + - Use instance methods on steam to check for listeners + - deps: mime@1.4.1 + - perf: improve path validation speed + +1.12.6 / 2017-09-22 +=================== + + * deps: send@0.15.6 + - deps: debug@2.6.9 + - perf: improve `If-Match` token parsing + * perf: improve slash collapsing + +1.12.5 / 2017-09-21 +=================== + + * deps: parseurl@~1.3.2 + - perf: reduce overhead for full URLs + - perf: unroll the "fast-path" `RegExp` + * deps: send@0.15.5 + - Fix handling of modified headers with invalid dates + - deps: etag@~1.8.1 + - deps: fresh@0.5.2 + +1.12.4 / 2017-08-05 +=================== + + * deps: send@0.15.4 + - deps: debug@2.6.8 + - deps: depd@~1.1.1 + - deps: http-errors@~1.6.2 + +1.12.3 / 2017-05-16 +=================== + + * deps: send@0.15.3 + - deps: debug@2.6.7 + +1.12.2 / 2017-04-26 +=================== + + * deps: send@0.15.2 + - deps: debug@2.6.4 + 1.12.1 / 2017-03-04 =================== diff --git a/nodejs/node_modules/serve-static/README.md b/nodejs/node_modules/serve-static/README.md index 3dd5f48c3..efd4f7648 100644 --- a/nodejs/node_modules/serve-static/README.md +++ b/nodejs/node_modules/serve-static/README.md @@ -44,7 +44,7 @@ of the `Range` request header. ##### cacheControl Enable or disable setting `Cache-Control` response header, defaults to -true. Disabling this will ignore the `maxAge` option. +true. Disabling this will ignore the `immutable` and `maxAge` options. ##### dotfiles @@ -93,6 +93,14 @@ all methods. The default value is `true`. +##### immutable + +Enable or diable the `immutable` directive in the `Cache-Control` response +header, defaults to `false`. If set to `true`, the `maxAge` option should +also be specified to enable caching. The `immutable` directive will prevent +supported clients from making conditional requests during the life of the +`maxAge` option to check if the file has changed. + ##### index By default this module will send "index.html" files in response to a request diff --git a/nodejs/node_modules/serve-static/index.js b/nodejs/node_modules/serve-static/index.js index 85df3d05d..3f7739156 100644 --- a/nodejs/node_modules/serve-static/index.js +++ b/nodejs/node_modules/serve-static/index.js @@ -132,7 +132,7 @@ function serveStatic (root, options) { */ function collapseLeadingSlashes (str) { for (var i = 0; i < str.length; i++) { - if (str[i] !== '/') { + if (str.charCodeAt(i) !== 0x2f /* / */) { break } } diff --git a/nodejs/node_modules/serve-static/package.json b/nodejs/node_modules/serve-static/package.json index 776f9f140..c628b9426 100644 --- a/nodejs/node_modules/serve-static/package.json +++ b/nodejs/node_modules/serve-static/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "serve-static@1.12.1", - "scope": null, - "escapedName": "serve-static", - "name": "serve-static", - "rawSpec": "1.12.1", - "spec": "1.12.1", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "serve-static@1.13.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "serve-static@1.12.1", - "_id": "serve-static@1.12.1", - "_inCache": true, + "_from": "serve-static@1.13.1", + "_id": "serve-static@1.13.1", + "_inBundle": false, + "_integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", "_location": "/serve-static", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/serve-static-1.12.1.tgz_1488686352386_0.390035341726616" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "serve-static@1.12.1", - "scope": null, - "escapedName": "serve-static", + "type": "version", + "registry": true, + "raw": "serve-static@1.13.1", "name": "serve-static", - "rawSpec": "1.12.1", - "spec": "1.12.1", - "type": "version" + "escapedName": "serve-static", + "rawSpec": "1.13.1", + "saveSpec": null, + "fetchSpec": "1.13.1" }, "_requiredBy": [ "/express" ], - "_resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz", - "_shasum": "7443a965e3ced647aceb5639fa06bf4d1bbe0039", - "_shrinkwrap": null, - "_spec": "serve-static@1.12.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", + "_spec": "1.13.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" @@ -55,25 +37,22 @@ "dependencies": { "encodeurl": "~1.0.1", "escape-html": "~1.0.3", - "parseurl": "~1.3.1", - "send": "0.15.1" + "parseurl": "~1.3.2", + "send": "0.16.1" }, "description": "Serve static files", "devDependencies": { - "eslint": "3.17.0", - "eslint-config-standard": "7.0.0", - "eslint-plugin-markdown": "1.0.0-beta.4", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.2.0", "eslint-plugin-promise": "3.5.0", - "eslint-plugin-standard": "2.1.1", + "eslint-plugin-standard": "3.0.1", "istanbul": "0.4.5", "mocha": "2.5.3", "supertest": "1.1.0" }, - "directories": {}, - "dist": { - "shasum": "7443a965e3ced647aceb5639fa06bf4d1bbe0039", - "tarball": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz" - }, "engines": { "node": ">= 0.8.0" }, @@ -82,18 +61,9 @@ "HISTORY.md", "index.js" ], - "gitHead": "3e6e778fcf6c88dcf659b8f1d5f06be2eebbe2db", "homepage": "https://github.com/expressjs/serve-static#readme", "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "serve-static", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/expressjs/serve-static.git" @@ -104,5 +74,5 @@ "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/" }, - "version": "1.12.1" + "version": "1.13.1" } diff --git a/nodejs/node_modules/setprototypeof/README.md b/nodejs/node_modules/setprototypeof/README.md index 01d794705..826bf029d 100644 --- a/nodejs/node_modules/setprototypeof/README.md +++ b/nodejs/node_modules/setprototypeof/README.md @@ -19,3 +19,8 @@ setPrototypeOf(obj, { }); obj.foo(); // bar ``` + +TypeScript is also supported: +```typescript +import setPrototypeOf = require('setprototypeof'); +``` \ No newline at end of file diff --git a/nodejs/node_modules/setprototypeof/index.d.ts b/nodejs/node_modules/setprototypeof/index.d.ts new file mode 100644 index 000000000..f108ecd0a --- /dev/null +++ b/nodejs/node_modules/setprototypeof/index.d.ts @@ -0,0 +1,2 @@ +declare function setPrototypeOf(o: any, proto: object | null): any; +export = setPrototypeOf; diff --git a/nodejs/node_modules/setprototypeof/package.json b/nodejs/node_modules/setprototypeof/package.json index 4fc13fe1a..7a8cf3497 100644 --- a/nodejs/node_modules/setprototypeof/package.json +++ b/nodejs/node_modules/setprototypeof/package.json @@ -1,66 +1,39 @@ { "_args": [ [ - { - "raw": "setprototypeof@1.0.3", - "scope": null, - "escapedName": "setprototypeof", - "name": "setprototypeof", - "rawSpec": "1.0.3", - "spec": "1.0.3", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "setprototypeof@1.1.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "setprototypeof@1.0.3", - "_id": "setprototypeof@1.0.3", - "_inCache": true, + "_from": "setprototypeof@1.1.0", + "_id": "setprototypeof@1.1.0", + "_inBundle": false, + "_integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", "_location": "/setprototypeof", - "_nodeVersion": "7.4.0", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/setprototypeof-1.0.3.tgz_1487607661334_0.977291816379875" - }, - "_npmUser": { - "name": "wesleytodd", - "email": "wes@wesleytodd.com" - }, - "_npmVersion": "4.0.5", "_phantomChildren": {}, "_requested": { - "raw": "setprototypeof@1.0.3", - "scope": null, - "escapedName": "setprototypeof", + "type": "version", + "registry": true, + "raw": "setprototypeof@1.1.0", "name": "setprototypeof", - "rawSpec": "1.0.3", - "spec": "1.0.3", - "type": "version" + "escapedName": "setprototypeof", + "rawSpec": "1.1.0", + "saveSpec": null, + "fetchSpec": "1.1.0" }, "_requiredBy": [ - "/express", - "/http-errors" + "/express" ], - "_resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "_shasum": "66567e37043eeb4f04d91bd658c0cbefb55b8e04", - "_shrinkwrap": null, - "_spec": "setprototypeof@1.0.3", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "_spec": "1.1.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Wes Todd" }, "bugs": { "url": "https://github.com/wesleytodd/setprototypeof/issues" }, - "dependencies": {}, "description": "A small polyfill for Object.setprototypeof", - "devDependencies": {}, - "directories": {}, - "dist": { - "shasum": "66567e37043eeb4f04d91bd658c0cbefb55b8e04", - "tarball": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz" - }, - "gitHead": "a8a71aab8118651b9b0ea97ecfc28521ec82b008", "homepage": "https://github.com/wesleytodd/setprototypeof", "keywords": [ "polyfill", @@ -69,15 +42,7 @@ ], "license": "ISC", "main": "index.js", - "maintainers": [ - { - "name": "wesleytodd", - "email": "wes@wesleytodd.com" - } - ], "name": "setprototypeof", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/wesleytodd/setprototypeof.git" @@ -85,5 +50,6 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "version": "1.0.3" + "typings": "index.d.ts", + "version": "1.1.0" } diff --git a/nodejs/node_modules/statuses/package.json b/nodejs/node_modules/statuses/package.json index 370c14382..895329d78 100644 --- a/nodejs/node_modules/statuses/package.json +++ b/nodejs/node_modules/statuses/package.json @@ -1,40 +1,25 @@ { "_args": [ [ - { - "raw": "statuses@~1.3.1", - "scope": null, - "escapedName": "statuses", - "name": "statuses", - "rawSpec": "~1.3.1", - "spec": ">=1.3.1 <1.4.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "statuses@1.3.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "statuses@>=1.3.1 <1.4.0", + "_from": "statuses@1.3.1", "_id": "statuses@1.3.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", "_location": "/statuses", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/statuses-1.3.1.tgz_1478923281491_0.5574048184789717" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "statuses@~1.3.1", - "scope": null, - "escapedName": "statuses", + "type": "version", + "registry": true, + "raw": "statuses@1.3.1", "name": "statuses", - "rawSpec": "~1.3.1", - "spec": ">=1.3.1 <1.4.0", - "type": "range" + "escapedName": "statuses", + "rawSpec": "1.3.1", + "saveSpec": null, + "fetchSpec": "1.3.1" }, "_requiredBy": [ "/express", @@ -43,10 +28,8 @@ "/send" ], "_resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "_shasum": "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e", - "_shrinkwrap": null, - "_spec": "statuses@~1.3.1", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.3.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/statuses/issues" }, @@ -61,7 +44,6 @@ "url": "http://jongleberry.com" } ], - "dependencies": {}, "description": "HTTP status utility", "devDependencies": { "csv-parse": "1.1.7", @@ -73,11 +55,6 @@ "mocha": "1.21.5", "stream-to-array": "2.3.0" }, - "directories": {}, - "dist": { - "shasum": "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e", - "tarball": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -87,43 +64,14 @@ "codes.json", "LICENSE" ], - "gitHead": "28a619be77f5b4741e6578a5764c5b06ec6d4aea", - "homepage": "https://github.com/jshttp/statuses", + "homepage": "https://github.com/jshttp/statuses#readme", "keywords": [ "http", "status", "code" ], "license": "MIT", - "maintainers": [ - { - "name": "defunctzombie", - "email": "shtylman@gmail.com" - }, - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "fishrock123", - "email": "fishrock123@rocketmail.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - }, - { - "name": "mscdex", - "email": "mscdex@mscdex.net" - }, - { - "name": "tjholowaychuk", - "email": "tj@vision-media.ca" - } - ], "name": "statuses", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/statuses.git" diff --git a/nodejs/node_modules/string_decoder/package.json b/nodejs/node_modules/string_decoder/package.json index b3d8d9616..69d2ab7d8 100644 --- a/nodejs/node_modules/string_decoder/package.json +++ b/nodejs/node_modules/string_decoder/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "string_decoder@~0.10.x", - "scope": null, - "escapedName": "string_decoder", - "name": "string_decoder", - "rawSpec": "~0.10.x", - "spec": ">=0.10.0 <0.11.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/readable-stream" + "string_decoder@0.10.31", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "string_decoder@>=0.10.0 <0.11.0", + "_from": "string_decoder@0.10.31", "_id": "string_decoder@0.10.31", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "_location": "/string_decoder", - "_npmUser": { - "name": "rvagg", - "email": "rod@vagg.org" - }, - "_npmVersion": "1.4.23", "_phantomChildren": {}, "_requested": { - "raw": "string_decoder@~0.10.x", - "scope": null, - "escapedName": "string_decoder", + "type": "version", + "registry": true, + "raw": "string_decoder@0.10.31", "name": "string_decoder", - "rawSpec": "~0.10.x", - "spec": ">=0.10.0 <0.11.0", - "type": "range" + "escapedName": "string_decoder", + "rawSpec": "0.10.31", + "saveSpec": null, + "fetchSpec": "0.10.31" }, "_requiredBy": [ "/readable-stream" ], "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94", - "_shrinkwrap": null, - "_spec": "string_decoder@~0.10.x", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/readable-stream", + "_spec": "0.10.31", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/rvagg/string_decoder/issues" }, @@ -48,12 +35,6 @@ "devDependencies": { "tap": "~0.4.8" }, - "directories": {}, - "dist": { - "shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94", - "tarball": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "gitHead": "d46d4fd87cf1d06e031c23f1ba170ca7d4ade9a0", "homepage": "https://github.com/rvagg/string_decoder", "keywords": [ "string", @@ -63,19 +44,7 @@ ], "license": "MIT", "main": "index.js", - "maintainers": [ - { - "name": "substack", - "email": "mail@substack.net" - }, - { - "name": "rvagg", - "email": "rod@vagg.org" - } - ], "name": "string_decoder", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/rvagg/string_decoder.git" diff --git a/nodejs/node_modules/strip-ansi/package.json b/nodejs/node_modules/strip-ansi/package.json index 618237f62..298793910 100644 --- a/nodejs/node_modules/strip-ansi/package.json +++ b/nodejs/node_modules/strip-ansi/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "strip-ansi@^0.3.0", - "scope": null, - "escapedName": "strip-ansi", - "name": "strip-ansi", - "rawSpec": "^0.3.0", - "spec": ">=0.3.0 <0.4.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk" + "strip-ansi@0.3.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "strip-ansi@>=0.3.0 <0.4.0", + "_from": "strip-ansi@0.3.0", "_id": "strip-ansi@0.3.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", "_location": "/strip-ansi", - "_npmUser": { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - }, - "_npmVersion": "1.4.9", "_phantomChildren": {}, "_requested": { - "raw": "strip-ansi@^0.3.0", - "scope": null, - "escapedName": "strip-ansi", + "type": "version", + "registry": true, + "raw": "strip-ansi@0.3.0", "name": "strip-ansi", - "rawSpec": "^0.3.0", - "spec": ">=0.3.0 <0.4.0", - "type": "range" + "escapedName": "strip-ansi", + "rawSpec": "0.3.0", + "saveSpec": null, + "fetchSpec": "0.3.0" }, "_requiredBy": [ "/chalk" ], "_resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "_shasum": "25f48ea22ca79187f3174a4db8759347bb126220", - "_shrinkwrap": null, - "_spec": "strip-ansi@^0.3.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk", + "_spec": "0.3.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -58,11 +45,6 @@ "devDependencies": { "mocha": "*" }, - "directories": {}, - "dist": { - "shasum": "25f48ea22ca79187f3174a4db8759347bb126220", - "tarball": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz" - }, "engines": { "node": ">=0.10.0" }, @@ -70,7 +52,7 @@ "index.js", "cli.js" ], - "homepage": "https://github.com/sindresorhus/strip-ansi", + "homepage": "https://github.com/sindresorhus/strip-ansi#readme", "keywords": [ "strip", "trim", @@ -97,18 +79,10 @@ "text" ], "license": "MIT", - "maintainers": [ - { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - } - ], "name": "strip-ansi", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", - "url": "git://github.com/sindresorhus/strip-ansi.git" + "url": "git+https://github.com/sindresorhus/strip-ansi.git" }, "scripts": { "test": "mocha" diff --git a/nodejs/node_modules/supports-color/package.json b/nodejs/node_modules/supports-color/package.json index fe4c3ea0c..7c6d05f5b 100644 --- a/nodejs/node_modules/supports-color/package.json +++ b/nodejs/node_modules/supports-color/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "supports-color@^0.2.0", - "scope": null, - "escapedName": "supports-color", - "name": "supports-color", - "rawSpec": "^0.2.0", - "spec": ">=0.2.0 <0.3.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk" + "supports-color@0.2.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "supports-color@>=0.2.0 <0.3.0", + "_from": "supports-color@0.2.0", "_id": "supports-color@0.2.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=", "_location": "/supports-color", - "_npmUser": { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - }, - "_npmVersion": "1.4.9", "_phantomChildren": {}, "_requested": { - "raw": "supports-color@^0.2.0", - "scope": null, - "escapedName": "supports-color", + "type": "version", + "registry": true, + "raw": "supports-color@0.2.0", "name": "supports-color", - "rawSpec": "^0.2.0", - "spec": ">=0.2.0 <0.3.0", - "type": "range" + "escapedName": "supports-color", + "rawSpec": "0.2.0", + "saveSpec": null, + "fetchSpec": "0.2.0" }, "_requiredBy": [ "/chalk" ], "_resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "_shasum": "d92de2694eb3f67323973d7ae3d8b55b4c22190a", - "_shrinkwrap": null, - "_spec": "supports-color@^0.2.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/chalk", + "_spec": "0.2.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Sindre Sorhus", "email": "sindresorhus@gmail.com", @@ -51,16 +38,10 @@ "bugs": { "url": "https://github.com/sindresorhus/supports-color/issues" }, - "dependencies": {}, "description": "Detect whether a terminal supports color", "devDependencies": { "mocha": "*" }, - "directories": {}, - "dist": { - "shasum": "d92de2694eb3f67323973d7ae3d8b55b4c22190a", - "tarball": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" - }, "engines": { "node": ">=0.10.0" }, @@ -68,7 +49,7 @@ "index.js", "cli.js" ], - "homepage": "https://github.com/sindresorhus/supports-color", + "homepage": "https://github.com/sindresorhus/supports-color#readme", "keywords": [ "cli", "bin", @@ -92,18 +73,10 @@ "detect" ], "license": "MIT", - "maintainers": [ - { - "name": "sindresorhus", - "email": "sindresorhus@gmail.com" - } - ], "name": "supports-color", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", - "url": "git://github.com/sindresorhus/supports-color.git" + "url": "git+https://github.com/sindresorhus/supports-color.git" }, "scripts": { "test": "mocha" diff --git a/nodejs/node_modules/type-is/package.json b/nodejs/node_modules/type-is/package.json index 063fe0101..495732d92 100644 --- a/nodejs/node_modules/type-is/package.json +++ b/nodejs/node_modules/type-is/package.json @@ -1,50 +1,33 @@ { "_args": [ [ - { - "raw": "type-is@~1.6.14", - "scope": null, - "escapedName": "type-is", - "name": "type-is", - "rawSpec": "~1.6.14", - "spec": ">=1.6.14 <1.7.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "type-is@1.6.15", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "type-is@>=1.6.14 <1.7.0", + "_from": "type-is@1.6.15", "_id": "type-is@1.6.15", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", "_location": "/type-is", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/type-is-1.6.15.tgz_1491016789014_0.6958203655667603" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "type-is@~1.6.14", - "scope": null, - "escapedName": "type-is", + "type": "version", + "registry": true, + "raw": "type-is@1.6.15", "name": "type-is", - "rawSpec": "~1.6.14", - "spec": ">=1.6.14 <1.7.0", - "type": "range" + "escapedName": "type-is", + "rawSpec": "1.6.15", + "saveSpec": null, + "fetchSpec": "1.6.15" }, "_requiredBy": [ + "/body-parser", "/express" ], "_resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", - "_shasum": "cab10fb4909e441c82842eafe1ad646c81804410", - "_shrinkwrap": null, - "_spec": "type-is@~1.6.14", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_spec": "1.6.15", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "bugs": { "url": "https://github.com/jshttp/type-is/issues" }, @@ -73,11 +56,6 @@ "istanbul": "0.4.5", "mocha": "1.21.5" }, - "directories": {}, - "dist": { - "shasum": "cab10fb4909e441c82842eafe1ad646c81804410", - "tarball": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz" - }, "engines": { "node": ">= 0.6" }, @@ -86,7 +64,6 @@ "HISTORY.md", "index.js" ], - "gitHead": "9e88be851cc628364ad8842433dce32437ea4e73", "homepage": "https://github.com/jshttp/type-is#readme", "keywords": [ "content", @@ -94,19 +71,7 @@ "checking" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - { - "name": "jongleberry", - "email": "jonathanrichardong@gmail.com" - } - ], "name": "type-is", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/type-is.git" diff --git a/nodejs/node_modules/unpipe/package.json b/nodejs/node_modules/unpipe/package.json index b9f7803b2..93a7538b4 100644 --- a/nodejs/node_modules/unpipe/package.json +++ b/nodejs/node_modules/unpipe/package.json @@ -1,45 +1,33 @@ { "_args": [ [ - { - "raw": "unpipe@~1.0.0", - "scope": null, - "escapedName": "unpipe", - "name": "unpipe", - "rawSpec": "~1.0.0", - "spec": ">=1.0.0 <1.1.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/finalhandler" + "unpipe@1.0.0", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "unpipe@>=1.0.0 <1.1.0", + "_from": "unpipe@1.0.0", "_id": "unpipe@1.0.0", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", "_location": "/unpipe", - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "unpipe@~1.0.0", - "scope": null, - "escapedName": "unpipe", + "type": "version", + "registry": true, + "raw": "unpipe@1.0.0", "name": "unpipe", - "rawSpec": "~1.0.0", - "spec": ">=1.0.0 <1.1.0", - "type": "range" + "escapedName": "unpipe", + "rawSpec": "1.0.0", + "saveSpec": null, + "fetchSpec": "1.0.0" }, "_requiredBy": [ - "/finalhandler" + "/finalhandler", + "/raw-body" ], "_resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "_shasum": "b2bf4ee8514aae6165b4817829d21b2ef49904ec", - "_shrinkwrap": null, - "_spec": "unpipe@~1.0.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/finalhandler", + "_spec": "1.0.0", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" @@ -47,18 +35,12 @@ "bugs": { "url": "https://github.com/stream-utils/unpipe/issues" }, - "dependencies": {}, "description": "Unpipe a stream from all destinations", "devDependencies": { "istanbul": "0.3.15", "mocha": "2.2.5", "readable-stream": "1.1.13" }, - "directories": {}, - "dist": { - "shasum": "b2bf4ee8514aae6165b4817829d21b2ef49904ec", - "tarball": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" - }, "engines": { "node": ">= 0.8" }, @@ -68,18 +50,9 @@ "README.md", "index.js" ], - "gitHead": "d2df901c06487430e78dca62b6edb8bb2fc5e99d", - "homepage": "https://github.com/stream-utils/unpipe", + "homepage": "https://github.com/stream-utils/unpipe#readme", "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "unpipe", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/stream-utils/unpipe.git" diff --git a/nodejs/node_modules/utils-merge/.npmignore b/nodejs/node_modules/utils-merge/.npmignore new file mode 100644 index 000000000..3e5384418 --- /dev/null +++ b/nodejs/node_modules/utils-merge/.npmignore @@ -0,0 +1,9 @@ +CONTRIBUTING.md +Makefile +docs/ +examples/ +reports/ +test/ + +.jshintrc +.travis.yml diff --git a/nodejs/node_modules/utils-merge/.travis.yml b/nodejs/node_modules/utils-merge/.travis.yml deleted file mode 100644 index af92b021b..000000000 --- a/nodejs/node_modules/utils-merge/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: "node_js" -node_js: - - "0.4" - - "0.6" - - "0.8" - - "0.10" diff --git a/nodejs/node_modules/utils-merge/LICENSE b/nodejs/node_modules/utils-merge/LICENSE index e33bd10bb..76f6d083d 100644 --- a/nodejs/node_modules/utils-merge/LICENSE +++ b/nodejs/node_modules/utils-merge/LICENSE @@ -1,6 +1,6 @@ -(The MIT License) +The MIT License (MIT) -Copyright (c) 2013 Jared Hanson +Copyright (c) 2013-2017 Jared Hanson 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 diff --git a/nodejs/node_modules/utils-merge/README.md b/nodejs/node_modules/utils-merge/README.md index 2f94e9bd2..0cb711712 100644 --- a/nodejs/node_modules/utils-merge/README.md +++ b/nodejs/node_modules/utils-merge/README.md @@ -1,10 +1,19 @@ # utils-merge +[![Version](https://img.shields.io/npm/v/utils-merge.svg?label=version)](https://www.npmjs.com/package/utils-merge) +[![Build](https://img.shields.io/travis/jaredhanson/utils-merge.svg)](https://travis-ci.org/jaredhanson/utils-merge) +[![Quality](https://img.shields.io/codeclimate/github/jaredhanson/utils-merge.svg?label=quality)](https://codeclimate.com/github/jaredhanson/utils-merge) +[![Coverage](https://img.shields.io/coveralls/jaredhanson/utils-merge.svg)](https://coveralls.io/r/jaredhanson/utils-merge) +[![Dependencies](https://img.shields.io/david/jaredhanson/utils-merge.svg)](https://david-dm.org/jaredhanson/utils-merge) + + Merges the properties from a source object into a destination object. ## Install - $ npm install utils-merge +```bash +$ npm install utils-merge +``` ## Usage @@ -16,19 +25,10 @@ merge(a, b); // => { foo: 'bar', bar: 'baz' } ``` -## Tests - - $ npm install - $ npm test - -[![Build Status](https://secure.travis-ci.org/jaredhanson/utils-merge.png)](http://travis-ci.org/jaredhanson/utils-merge) - -## Credits - - - [Jared Hanson](http://github.com/jaredhanson) - ## License [The MIT License](http://opensource.org/licenses/MIT) -Copyright (c) 2013 Jared Hanson <[http://jaredhanson.net/](http://jaredhanson.net/)> +Copyright (c) 2013-2017 Jared Hanson <[http://jaredhanson.net/](http://jaredhanson.net/)> + + Sponsor diff --git a/nodejs/node_modules/utils-merge/package.json b/nodejs/node_modules/utils-merge/package.json index 5fdaf0fd9..c16fba026 100644 --- a/nodejs/node_modules/utils-merge/package.json +++ b/nodejs/node_modules/utils-merge/package.json @@ -1,45 +1,32 @@ { "_args": [ [ - { - "raw": "utils-merge@1.0.0", - "scope": null, - "escapedName": "utils-merge", - "name": "utils-merge", - "rawSpec": "1.0.0", - "spec": "1.0.0", - "type": "version" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "utils-merge@1.0.1", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "utils-merge@1.0.0", - "_id": "utils-merge@1.0.0", - "_inCache": true, + "_from": "utils-merge@1.0.1", + "_id": "utils-merge@1.0.1", + "_inBundle": false, + "_integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", "_location": "/utils-merge", - "_npmUser": { - "name": "jaredhanson", - "email": "jaredhanson@gmail.com" - }, - "_npmVersion": "1.2.25", "_phantomChildren": {}, "_requested": { - "raw": "utils-merge@1.0.0", - "scope": null, - "escapedName": "utils-merge", + "type": "version", + "registry": true, + "raw": "utils-merge@1.0.1", "name": "utils-merge", - "rawSpec": "1.0.0", - "spec": "1.0.0", - "type": "version" + "escapedName": "utils-merge", + "rawSpec": "1.0.1", + "saveSpec": null, + "fetchSpec": "1.0.1" }, "_requiredBy": [ "/express" ], - "_resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "_shasum": "0294fb922bb9375153541c4f7096231f287c8af8", - "_shrinkwrap": null, - "_spec": "utils-merge@1.0.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "_spec": "1.0.1", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Jared Hanson", "email": "jaredhanson@gmail.com", @@ -52,13 +39,9 @@ "description": "merge() utility function", "devDependencies": { "chai": "1.x.x", + "make-node": "0.3.x", "mocha": "1.x.x" }, - "directories": {}, - "dist": { - "shasum": "0294fb922bb9375153541c4f7096231f287c8af8", - "tarball": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" - }, "engines": { "node": ">= 0.4.0" }, @@ -66,28 +49,21 @@ "keywords": [ "util" ], + "license": "MIT", "licenses": [ { "type": "MIT", - "url": "http://www.opensource.org/licenses/MIT" + "url": "http://opensource.org/licenses/MIT" } ], "main": "./index", - "maintainers": [ - { - "name": "jaredhanson", - "email": "jaredhanson@gmail.com" - } - ], "name": "utils-merge", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git://github.com/jaredhanson/utils-merge.git" }, "scripts": { - "test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js" + "test": "mocha --reporter spec --require test/bootstrap/node test/*.test.js" }, - "version": "1.0.0" + "version": "1.0.1" } diff --git a/nodejs/node_modules/vary/HISTORY.md b/nodejs/node_modules/vary/HISTORY.md index 23d13de2a..f6cbcf7f9 100644 --- a/nodejs/node_modules/vary/HISTORY.md +++ b/nodejs/node_modules/vary/HISTORY.md @@ -1,3 +1,8 @@ +1.1.2 / 2017-09-23 +================== + + * perf: improve header token parsing speed + 1.1.1 / 2017-03-20 ================== diff --git a/nodejs/node_modules/vary/index.js b/nodejs/node_modules/vary/index.js index ac37a8338..5b5e74127 100644 --- a/nodejs/node_modules/vary/index.js +++ b/nodejs/node_modules/vary/index.js @@ -13,13 +13,6 @@ module.exports = vary module.exports.append = append -/** - * Regular expression to split on commas, trimming spaces - * @private - */ - -var ARRAY_SPLIT_REGEXP = / *, */ - /** * RegExp to match field-name in RFC 7230 sec 3.2 * @@ -101,7 +94,32 @@ function append (header, field) { */ function parse (header) { - return header.trim().split(ARRAY_SPLIT_REGEXP) + var end = 0 + var list = [] + var start = 0 + + // gather tokens + for (var i = 0, len = header.length; i < len; i++) { + switch (header.charCodeAt(i)) { + case 0x20: /* */ + if (start === end) { + start = end = i + 1 + } + break + case 0x2c: /* , */ + list.push(header.substring(start, end)) + start = end = i + 1 + break + default: + end = i + 1 + break + } + } + + // final token + list.push(header.substring(start, end)) + + return list } /** diff --git a/nodejs/node_modules/vary/package.json b/nodejs/node_modules/vary/package.json index 9decb0eb3..4b102033e 100644 --- a/nodejs/node_modules/vary/package.json +++ b/nodejs/node_modules/vary/package.json @@ -1,50 +1,32 @@ { "_args": [ [ - { - "raw": "vary@~1.1.0", - "scope": null, - "escapedName": "vary", - "name": "vary", - "rawSpec": "~1.1.0", - "spec": ">=1.1.0 <1.2.0", - "type": "range" - }, - "/Users/muammar/github/mkchromecast/nodejs/node_modules/express" + "vary@1.1.2", + "/Users/muammar/github/mkchromecast/nodejs" ] ], - "_from": "vary@>=1.1.0 <1.2.0", - "_id": "vary@1.1.1", - "_inCache": true, + "_from": "vary@1.1.2", + "_id": "vary@1.1.2", + "_inBundle": false, + "_integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "_location": "/vary", - "_nodeVersion": "4.7.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/vary-1.1.1.tgz_1490045547529_0.9355870047584176" - }, - "_npmUser": { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - }, - "_npmVersion": "2.15.11", "_phantomChildren": {}, "_requested": { - "raw": "vary@~1.1.0", - "scope": null, - "escapedName": "vary", + "type": "version", + "registry": true, + "raw": "vary@1.1.2", "name": "vary", - "rawSpec": "~1.1.0", - "spec": ">=1.1.0 <1.2.0", - "type": "range" + "escapedName": "vary", + "rawSpec": "1.1.2", + "saveSpec": null, + "fetchSpec": "1.1.2" }, "_requiredBy": [ "/express" ], - "_resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz", - "_shasum": "67535ebb694c1d52257457984665323f587e8d37", - "_shrinkwrap": null, - "_spec": "vary@~1.1.0", - "_where": "/Users/muammar/github/mkchromecast/nodejs/node_modules/express", + "_resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "_spec": "1.1.2", + "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { "name": "Douglas Christopher Wilson", "email": "doug@somethingdoug.com" @@ -52,23 +34,21 @@ "bugs": { "url": "https://github.com/jshttp/vary/issues" }, - "dependencies": {}, "description": "Manipulate the HTTP Vary header", "devDependencies": { - "eslint": "3.18.0", - "eslint-config-standard": "7.1.0", - "eslint-plugin-markdown": "1.0.0-beta.4", + "beautify-benchmark": "0.2.4", + "benchmark": "2.1.4", + "eslint": "3.19.0", + "eslint-config-standard": "10.2.1", + "eslint-plugin-import": "2.7.0", + "eslint-plugin-markdown": "1.0.0-beta.6", + "eslint-plugin-node": "5.1.1", "eslint-plugin-promise": "3.5.0", - "eslint-plugin-standard": "2.1.1", + "eslint-plugin-standard": "3.0.1", "istanbul": "0.4.5", "mocha": "2.5.3", "supertest": "1.1.0" }, - "directories": {}, - "dist": { - "shasum": "67535ebb694c1d52257457984665323f587e8d37", - "tarball": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz" - }, "engines": { "node": ">= 0.8" }, @@ -78,7 +58,6 @@ "README.md", "index.js" ], - "gitHead": "ca7edac6b919a45bf9e2c5cb6ba31c1790e9f046", "homepage": "https://github.com/jshttp/vary#readme", "keywords": [ "http", @@ -86,24 +65,17 @@ "vary" ], "license": "MIT", - "maintainers": [ - { - "name": "dougwilson", - "email": "doug@somethingdoug.com" - } - ], "name": "vary", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/jshttp/vary.git" }, "scripts": { + "bench": "node benchmark/index.js", "lint": "eslint --plugin markdown --ext js,md .", "test": "mocha --reporter spec --bail --check-leaks test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/", "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/" }, - "version": "1.1.1" + "version": "1.1.2" } diff --git a/nodejs/node_modules/webcast-osx-audio/package.json b/nodejs/node_modules/webcast-osx-audio/package.json index 64b7cdeb5..86e043d8b 100644 --- a/nodejs/node_modules/webcast-osx-audio/package.json +++ b/nodejs/node_modules/webcast-osx-audio/package.json @@ -1,48 +1,26 @@ { - "_args": [ - [ - { - "raw": "webcast-osx-audio", - "scope": null, - "escapedName": "webcast-osx-audio", - "name": "webcast-osx-audio", - "rawSpec": "", - "spec": "latest", - "type": "tag" - }, - "/Users/muammar/github/mkchromecast/nodejs" - ] - ], - "_from": "webcast-osx-audio@latest", + "_from": "webcast-osx-audio", "_id": "webcast-osx-audio@1.0.1", - "_inCache": true, + "_inBundle": false, + "_integrity": "sha1-kcJyTTUI6YlkcE0TwSaG1h5CDrk=", "_location": "/webcast-osx-audio", - "_nodeVersion": "4.2.3", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/webcast-osx-audio-1.0.1.tgz_1463256586208_0.26259636017493904" - }, - "_npmUser": { - "name": "fardog", - "email": "code@fardogllc.com" - }, - "_npmVersion": "2.14.7", "_phantomChildren": {}, "_requested": { + "type": "tag", + "registry": true, "raw": "webcast-osx-audio", - "scope": null, - "escapedName": "webcast-osx-audio", "name": "webcast-osx-audio", + "escapedName": "webcast-osx-audio", "rawSpec": "", - "spec": "latest", - "type": "tag" + "saveSpec": null, + "fetchSpec": "latest" }, "_requiredBy": [ - "#USER" + "#USER", + "/" ], "_resolved": "https://registry.npmjs.org/webcast-osx-audio/-/webcast-osx-audio-1.0.1.tgz", "_shasum": "91c2724d3508e98964704d13c12686d61e420eb9", - "_shrinkwrap": null, "_spec": "webcast-osx-audio", "_where": "/Users/muammar/github/mkchromecast/nodejs", "author": { @@ -55,6 +33,7 @@ "bugs": { "url": "https://github.com/fardog/node-webcast-osx-audio/issues" }, + "bundleDependencies": false, "dependencies": { "chalk": "^0.5.1", "debug": "^2.0.0", @@ -63,17 +42,11 @@ "minimist": "^1.1.0", "osx-audio": "^1.0.0" }, + "deprecated": false, "description": "Stream OS X audio input to an mp3 webcast.", - "devDependencies": {}, - "directories": {}, - "dist": { - "shasum": "91c2724d3508e98964704d13c12686d61e420eb9", - "tarball": "https://registry.npmjs.org/webcast-osx-audio/-/webcast-osx-audio-1.0.1.tgz" - }, "engines": { "node": ">=0.10.30" }, - "gitHead": "dcb9287a14344730ea85b77198439f657a26a927", "homepage": "https://github.com/fardog/node-webcast-osx-audio#readme", "keywords": [ "audio", @@ -83,19 +56,11 @@ ], "license": "MIT", "main": "index.js", - "maintainers": [ - { - "name": "fardog", - "email": "code@fardogllc.com" - } - ], "name": "webcast-osx-audio", - "optionalDependencies": {}, "os": [ "darwin" ], "preferGlobal": true, - "readme": "ERROR: No README data found!", "repository": { "type": "git", "url": "git+https://github.com/fardog/node-webcast-osx-audio.git" diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json new file mode 100644 index 000000000..e2e96b604 --- /dev/null +++ b/nodejs/package-lock.json @@ -0,0 +1,478 @@ +{ + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "accepts": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", + "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=", + "requires": { + "mime-types": "2.1.17", + "negotiator": "0.6.1" + } + }, + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "bindings": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz", + "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==" + }, + "body-parser": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", + "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "requires": { + "bytes": "3.0.0", + "content-type": "1.0.4", + "debug": "2.6.9", + "depd": "1.1.1", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "on-finished": "2.3.0", + "qs": "6.5.1", + "raw-body": "2.3.2", + "type-is": "1.6.15" + } + }, + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" + }, + "chalk": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "requires": { + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" + } + }, + "content-disposition": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "depd": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "encodeurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "express": { + "version": "4.16.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz", + "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=", + "requires": { + "accepts": "1.3.4", + "array-flatten": "1.1.1", + "body-parser": "1.18.2", + "content-disposition": "0.5.2", + "content-type": "1.0.4", + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "1.1.1", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.1", + "finalhandler": "1.1.0", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "path-to-regexp": "0.1.7", + "proxy-addr": "2.0.2", + "qs": "6.5.1", + "range-parser": "1.2.0", + "safe-buffer": "5.1.1", + "send": "0.16.1", + "serve-static": "1.13.1", + "setprototypeof": "1.1.0", + "statuses": "1.3.1", + "type-is": "1.6.15", + "utils-merge": "1.0.1", + "vary": "1.1.2" + } + }, + "finalhandler": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", + "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", + "requires": { + "debug": "2.6.9", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.3.1", + "unpipe": "1.0.0" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "requires": { + "ansi-regex": "0.2.1" + } + }, + "http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": "1.3.1" + }, + "dependencies": { + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=" + } + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ipaddr.js": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz", + "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "lame": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lame/-/lame-1.2.4.tgz", + "integrity": "sha1-VGgBUU4t6MoMie7yIogMjcZxJIU=", + "requires": { + "bindings": "1.3.0", + "debug": "2.6.9", + "nan": "2.8.0", + "readable-stream": "1.1.14" + } + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + }, + "mime": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", + "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" + }, + "mime-db": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" + }, + "mime-types": { + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", + "requires": { + "mime-db": "1.30.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "nan": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" + }, + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "1.1.1" + } + }, + "osx-audio": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/osx-audio/-/osx-audio-1.0.0.tgz", + "integrity": "sha1-FGnbQrT/mv6jc9egxWpNfZ0E7z8=", + "requires": { + "bindings": "1.3.0", + "debug": "2.6.9", + "nan": "2.8.0" + } + }, + "parseurl": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "proxy-addr": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz", + "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=", + "requires": { + "forwarded": "0.1.2", + "ipaddr.js": "1.5.2" + } + }, + "qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + }, + "raw-body": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", + "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "requires": { + "bytes": "3.0.0", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "unpipe": "1.0.0" + } + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "send": { + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", + "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "requires": { + "debug": "2.6.9", + "depd": "1.1.1", + "destroy": "1.0.4", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.8.1", + "fresh": "0.5.2", + "http-errors": "1.6.2", + "mime": "1.4.1", + "ms": "2.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.3.1" + } + }, + "serve-static": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", + "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "requires": { + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "parseurl": "1.3.2", + "send": "0.16.1" + } + }, + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + }, + "statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "requires": { + "ansi-regex": "0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" + }, + "type-is": { + "version": "1.6.15", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", + "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", + "requires": { + "media-typer": "0.3.0", + "mime-types": "2.1.17" + } + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + }, + "webcast-osx-audio": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/webcast-osx-audio/-/webcast-osx-audio-1.0.1.tgz", + "integrity": "sha1-kcJyTTUI6YlkcE0TwSaG1h5CDrk=", + "requires": { + "chalk": "0.5.1", + "debug": "2.6.9", + "express": "4.16.2", + "lame": "1.2.4", + "minimist": "1.2.0", + "osx-audio": "1.0.0" + } + } + } +} diff --git a/setup.py b/setup.py index dbda24cf4..4db4da0ec 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ version=open('mkchromecast/version.py').readlines()[-1].split()[-1].strip("\"'") APP = ['start_tray.py'] -APP_NAME = 'mkchromecast' +APP_NAME = 'Mkchromecast' DATA_FILES = [ 'images/google.icns', 'images/google_working.icns', @@ -59,7 +59,8 @@ 'CFBundleVersion': version, 'CFBundleShortVersionString': version, 'NSHumanReadableCopyright': u'Copyright (c) 2017, Muammar El Khatib, All Rights Reserved', - 'LSPrefersPPC': True + 'LSPrefersPPC': True, + 'LSUIElement': True } } @@ -67,7 +68,7 @@ name=APP_NAME, app=APP, data_files=DATA_FILES, - package='mkchromecast', + package='Mkchromecast', platforms=['i386', 'x86_64'], options={'py2app': OPTIONS}, setup_requires=['py2app'],