From e154eb809ee05adf71412ebcd97a53e4c0d00b90 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Thu, 21 May 2020 17:19:20 +0000 Subject: [PATCH 01/29] Initial setup --- .gitignore | 104 --- .glitch-assets | 6 + LICENSE | 674 ----------------- README.md | 2 + config.js | 6 + package.json | 35 + public/script.js | 10 + public/style.css | 70 ++ server.js | 63 ++ sessions | Bin 0 -> 12288 bytes shrinkwrap.yaml | 1549 +++++++++++++++++++++++++++++++++++++++ views/index.html | 15 + views/layouts/main.html | 21 + views/station.html | 3 + 14 files changed, 1780 insertions(+), 778 deletions(-) delete mode 100644 .gitignore create mode 100644 .glitch-assets delete mode 100644 LICENSE create mode 100644 README.md create mode 100644 config.js create mode 100644 package.json create mode 100644 public/script.js create mode 100644 public/style.css create mode 100644 server.js create mode 100644 sessions create mode 100644 shrinkwrap.yaml create mode 100644 views/index.html create mode 100644 views/layouts/main.html create mode 100644 views/station.html diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6704566..0000000 --- a/.gitignore +++ /dev/null @@ -1,104 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# Next.js build output -.next - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and *not* Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port diff --git a/.glitch-assets b/.glitch-assets new file mode 100644 index 0000000..954626f --- /dev/null +++ b/.glitch-assets @@ -0,0 +1,6 @@ +{"name":"drag-in-files.svg","date":"2016-10-22T16:17:49.954Z","url":"https://cdn.hyperdev.com/drag-in-files.svg","type":"image/svg","size":7646,"imageWidth":276,"imageHeight":276,"thumbnail":"https://cdn.hyperdev.com/drag-in-files.svg","thumbnailWidth":276,"thumbnailHeight":276,"dominantColor":"rgb(102, 153, 205)","uuid":"adSBq97hhhpFNUna"} +{"name":"click-me.svg","date":"2016-10-23T16:17:49.954Z","url":"https://cdn.hyperdev.com/click-me.svg","type":"image/svg","size":7116,"imageWidth":276,"imageHeight":276,"thumbnail":"https://cdn.hyperdev.com/click-me.svg","thumbnailWidth":276,"thumbnailHeight":276,"dominantColor":"rgb(243, 185, 186)","uuid":"adSBq97hhhpFNUnb"} +{"name":"paste-me.svg","date":"2016-10-24T16:17:49.954Z","url":"https://cdn.hyperdev.com/paste-me.svg","type":"image/svg","size":7242,"imageWidth":276,"imageHeight":276,"thumbnail":"https://cdn.hyperdev.com/paste-me.svg","thumbnailWidth":276,"thumbnailHeight":276,"dominantColor":"rgb(42, 179, 185)","uuid":"adSBq97hhhpFNUnc"} +{"uuid":"adSBq97hhhpFNUna","deleted":true} +{"uuid":"adSBq97hhhpFNUnb","deleted":true} +{"uuid":"adSBq97hhhpFNUnc","deleted":true} diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/README.md b/README.md new file mode 100644 index 0000000..d4f7290 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# Hey there +This is a project based on the starter node template but it includes libraries to store user data, maintain sessions, and make all your pages use a template. Enjoy! \ No newline at end of file diff --git a/config.js b/config.js new file mode 100644 index 0000000..a17e0ca --- /dev/null +++ b/config.js @@ -0,0 +1,6 @@ +module.exports = { + "brand":"OpenRadio", + "webexports":{ + "display_brand":"OpenRadio" + } +} \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..cde12a5 --- /dev/null +++ b/package.json @@ -0,0 +1,35 @@ +{ + "//1": "describes your app and its dependencies", + "//2": "https://docs.npmjs.com/files/package.json", + "//3": "updating this file will download and update your packages", + "name": "hello-empowered-express", + "version": "0.0.1", + "description": "A simple Node app built on Express, instantly up and running.", + "main": "server.js", + "scripts": { + "start": "node server.js" + }, + "dependencies": { + "express": "^4.17.1", + "socket.io": "^2.3.0", + "express-session": "^1.17.1", + "endb": "^0.22.9", + "handlebars": "^4.7.6", + "express-handlebars": "^4.0.3", + "socket.io-express-session": "^0.1.3", + "body-parser": "^1.19.0", + "connect-sqlite3": "^0.9.11" + }, + "engines": { + "node": "12.x" + }, + "repository": { + "url": "https://glitch.com/edit/#!/empowered-express" + }, + "license": "MIT", + "keywords": [ + "node", + "glitch", + "express" + ] +} \ No newline at end of file diff --git a/public/script.js b/public/script.js new file mode 100644 index 0000000..85749cd --- /dev/null +++ b/public/script.js @@ -0,0 +1,10 @@ +// client-side js, loaded by index.html +// run by the browser each time the page is loaded + +console.log("hello empowered world"); +let dotsIter = 0; +const dotsAnimation = [".","..","..."] +setInterval(function(){ + $(".dots-animate").html(dotsAnimation[dotsIter % dotsAnimation.length]) + dotsIter = (dotsIter + 1) % dotsAnimation.length; +},500) \ No newline at end of file diff --git a/public/style.css b/public/style.css new file mode 100644 index 0000000..58c29a1 --- /dev/null +++ b/public/style.css @@ -0,0 +1,70 @@ +/* this file is loaded by index.html and styles the page */ + +* { + box-sizing: border-box; +} + +body { + font-family: sans-serif; + margin: 2em 1em; + line-height: 1.5em; +} + +h1 { + font-style: italic; + color: #373fff; + max-width: calc(100% - 5rem); + line-height: 1.1; +} + +form { + background-color: #eee; + display: grid; + grid-gap: 1em; + padding: 1em; + max-width: 40ch; +} + +input { + border: 1px solid silver; + display: block; + font-size: 16px; + margin-bottom: 10px; + padding: 5px; + width: 100%; +} + +form button { + background-color: #bbbbf2; + border: 2px solid currentColor; + border-radius: .25em; + cursor: pointer; + font-size: inherit; + line-height: 1.4em; + padding: 0.25em 1em; + max-width: 20ch; +} + +form button:hover { + background-color: lavender; +} + +footer { + margin-top: 3em; + padding-top: 1.5em; + border-top: 1px solid lightgrey; +} +.codelist > li{ + font-family: Consolas, Courier; +} +.white{ + color: white; + background: gray; + margin: 0px; + font-weight: lighter; +} +.spaced{ + padding: 8px;4} +.center { + text-align-last: center; +} \ No newline at end of file diff --git a/server.js b/server.js new file mode 100644 index 0000000..23de49c --- /dev/null +++ b/server.js @@ -0,0 +1,63 @@ +// server.js +// where your node app starts + +// we've started you off with Express (https://expressjs.com/) +// but feel free to use whatever libraries or frameworks you'd like through `package.json`. +const express = require("express"); +const app = express(); +const path = require("path"); +var session = require("express-session"); +const exphbs = require("express-handlebars"); +const config = require("./config"); +app.engine(".html", exphbs({ extname: ".html" })); +app.set("view engine", ".html"); +var SQLiteStore = require("connect-sqlite3")(session); +let sess = session({ + store: new SQLiteStore(), + secret: process.env.SECRET, + cookie: { maxAge: 7 * 24 * 60 * 60 * 1000 }, + resave: true, + saveUninitialized: false + }); +app.use( + sess +); +var bodyParser = require("body-parser"); +app.use(bodyParser.json()); // support json encoded bodies +app.use(bodyParser.urlencoded({ extended: true })); // support encoded bodies +var http = require('http').createServer(app); +//var server = http.Server(app); +var io = require('socket.io')(http); +// Setup sessions for socketio +var ios = require('socket.io-express-session'); +io.use(ios(sess)); +// make all the files in 'public' available +// https://expressjs.com/en/starter/static-files.html +var fs = require("fs"); +var stationtemplate = fs.readFileSync(__dirname+'/views/station.html',"utf8"); +const Handlebars = require("handlebars"); +var template = Handlebars.compile(stationtemplate); +app.use(express.static("public")); +// Testing streams +let streams = ["test"]; +// https://expressjs.com/en/starter/basic-routing.html +app.get("/", (req, res) => { + let output = "" + for(var i =0 ; i < streams; i ++){ + + } + res.render(__dirname + "/views/index.html", {...config.webexports, ...{stations: output}}); +}); +app.get("/stream/:name",async function(req,res){ + let name = req.params.name; + if(name == "test"){ + + } + res.send(req.params.name); +}) + + +// listen for requests :) +const listener = http.listen(process.env.PORT, () => { + console.log("Your app is listening on port " + listener.address().port); +}); diff --git a/sessions b/sessions new file mode 100644 index 0000000000000000000000000000000000000000..7294b5fc1e1731fa38e13d1fa48a509ca7308587 GIT binary patch literal 12288 zcmeI#F-yZh6u|L!sT2`Px^)V?QK4AG(ZyIYh!r$;=@cS4Ay6CbMW~<9&*SE3E^u@A z@PBak@^W{9`(=7B&#St%`qu2<%T}*tD#pmIs)(3wjJgrR*C(OqvagSYk;|LkN&F{K z>?C&a&#?onBY*$`2q1s}0tg_000IagFc5*4rujx6vdvuW;iKN$YToa;SVZI5GBHx`DtmCB+pecC%CENR>mq!n zxC&3cuRryk6F*J;L?D0w0tg_000IagfB*srAb`M71LcMd$|_^2q1s}0tg_0 N00IagfB*u$z&{r|Hu3-f literal 0 HcmV?d00001 diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml new file mode 100644 index 0000000..7f39c01 --- /dev/null +++ b/shrinkwrap.yaml @@ -0,0 +1,1549 @@ +dependencies: + body-parser: 1.19.0 + connect-sqlite3: 0.9.11 + endb: 0.22.9 + express: 4.17.1 + express-handlebars: 4.0.3 + express-session: 1.17.1 + handlebars: 4.7.6 + socket.io: 2.3.0 + socket.io-express-session: 0.1.3 +packages: + /abbrev/1.1.1: + dev: false + resolution: + integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + /accepts/1.3.7: + dependencies: + mime-types: 2.1.25 + negotiator: 0.6.2 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + /after/0.8.2: + dev: false + resolution: + integrity: sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= + /ajv/6.12.2: + dependencies: + fast-deep-equal: 3.1.1 + fast-json-stable-stringify: 2.1.0 + json-schema-traverse: 0.4.1 + uri-js: 4.2.2 + dev: false + resolution: + integrity: sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== + /ansi-regex/2.1.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + /ansi-regex/3.0.0: + dev: false + engines: + node: '>=4' + resolution: + integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + /aproba/1.2.0: + dev: false + resolution: + integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + /are-we-there-yet/1.1.5: + dependencies: + delegates: 1.0.0 + readable-stream: 2.3.7 + dev: false + resolution: + integrity: sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + /array-flatten/1.1.1: + dev: false + resolution: + integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + /arraybuffer.slice/0.0.7: + dev: false + resolution: + integrity: sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== + /asap/2.0.6: + dev: false + resolution: + integrity: sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= + /asn1/0.2.4: + dependencies: + safer-buffer: 2.1.2 + dev: false + resolution: + integrity: sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + /assert-plus/1.0.0: + dev: false + engines: + node: '>=0.8' + resolution: + integrity: sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + /async-limiter/1.0.1: + dev: false + resolution: + integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + /asynckit/0.4.0: + dev: false + resolution: + integrity: sha1-x57Zf380y48robyXkLzDZkdLS3k= + /aws-sign2/0.7.0: + dev: false + resolution: + integrity: sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + /aws4/1.9.1: + dev: false + resolution: + integrity: sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== + /backo2/1.0.2: + dev: false + resolution: + integrity: sha1-MasayLEpNjRj41s+u2n038+6eUc= + /balanced-match/1.0.0: + dev: false + resolution: + integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + /base64-arraybuffer/0.1.5: + dev: false + engines: + node: '>= 0.6.0' + resolution: + integrity: sha1-c5JncZI7Whl0etZmqlzUv5xunOg= + /base64id/2.0.0: + dev: false + engines: + node: ^4.5.0 || >= 5.9 + resolution: + integrity: sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== + /bcrypt-pbkdf/1.0.2: + dependencies: + tweetnacl: 0.14.5 + dev: false + resolution: + integrity: sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + /better-assert/1.0.2: + dependencies: + callsite: 1.0.0 + dev: false + resolution: + integrity: sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI= + /blob/0.0.5: + dev: false + resolution: + integrity: sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== + /body-parser/1.19.0: + dependencies: + bytes: 3.1.0 + content-type: 1.0.4 + debug: 2.6.9 + depd: 1.1.2 + http-errors: 1.7.2 + iconv-lite: 0.4.24 + on-finished: 2.3.0 + qs: 6.7.0 + raw-body: 2.4.0 + type-is: 1.6.18 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + /brace-expansion/1.1.11: + dependencies: + balanced-match: 1.0.0 + concat-map: 0.0.1 + dev: false + resolution: + integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + /buffer-json/2.0.0: + dev: false + resolution: + integrity: sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== + /bytes/3.1.0: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + /callsite/1.0.0: + dev: false + resolution: + integrity: sha1-KAOY5dZkvXQDi28JBRU+borxvCA= + /caseless/0.12.0: + dev: false + resolution: + integrity: sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + /chownr/1.1.4: + dev: false + resolution: + integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + /code-point-at/1.1.0: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + /combined-stream/1.0.8: + dependencies: + delayed-stream: 1.0.0 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + /commander/2.20.3: + dev: false + optional: true + resolution: + integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + /component-bind/1.0.0: + dev: false + resolution: + integrity: sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= + /component-emitter/1.2.1: + dev: false + resolution: + integrity: sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + /component-inherit/0.0.3: + dev: false + resolution: + integrity: sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= + /concat-map/0.0.1: + dev: false + resolution: + integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + /connect-sqlite3/0.9.11: + dependencies: + sqlite3: 4.1.1 + dev: false + engines: + node: '>=0.4.x' + resolution: + integrity: sha1-TlQVXcLq3ypZmDhbLzXoPdkkCy0= + /console-control-strings/1.1.0: + dev: false + resolution: + integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + /content-disposition/0.5.3: + dependencies: + safe-buffer: 5.1.2 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + /content-type/1.0.4: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + /cookie-signature/1.0.6: + dev: false + resolution: + integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + /cookie/0.3.1: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= + /cookie/0.4.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + /core-util-is/1.0.2: + dev: false + resolution: + integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + /dashdash/1.14.1: + dependencies: + assert-plus: 1.0.0 + dev: false + engines: + node: '>=0.10' + resolution: + integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + /debug/2.6.9: + dependencies: + ms: 2.0.0 + dev: false + resolution: + integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + /debug/3.1.0: + dependencies: + ms: 2.0.0 + dev: false + resolution: + integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + /debug/3.2.6: + dependencies: + ms: 2.1.2 + dev: false + resolution: + integrity: sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + /debug/4.1.1: + dependencies: + ms: 2.1.2 + dev: false + resolution: + integrity: sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + /deep-extend/0.6.0: + dev: false + engines: + node: '>=4.0.0' + resolution: + integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + /define-properties/1.1.3: + dependencies: + object-keys: 1.1.1 + dev: false + engines: + node: '>= 0.4' + resolution: + integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + /delayed-stream/1.0.0: + dev: false + engines: + node: '>=0.4.0' + resolution: + integrity: sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + /delegates/1.0.0: + dev: false + resolution: + integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + /depd/1.1.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + /depd/2.0.0: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + /destroy/1.0.4: + dev: false + resolution: + integrity: sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + /detect-libc/1.0.3: + dev: false + engines: + node: '>=0.10' + hasBin: true + resolution: + integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + /ecc-jsbn/0.1.2: + dependencies: + jsbn: 0.1.1 + safer-buffer: 2.1.2 + dev: false + resolution: + integrity: sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + /ee-first/1.1.1: + dev: false + resolution: + integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + /encodeurl/1.0.2: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + /endb/0.22.9: + dependencies: + buffer-json: 2.0.0 + lodash: 4.17.15 + dev: false + resolution: + integrity: sha512-uj0jVcdeAL20WriEE6GrB/QPp3+0xAW5A1ZVzLAgbqn8W7i3VJIk5MqT9bf1DxhPFPMgn9at5p7dBUWIAwA2EA== + /engine.io-client/3.4.1: + dependencies: + component-emitter: 1.2.1 + component-inherit: 0.0.3 + debug: 4.1.1 + engine.io-parser: 2.2.0 + has-cors: 1.1.0 + indexof: 0.0.1 + parseqs: 0.0.5 + parseuri: 0.0.5 + ws: 6.1.4 + xmlhttprequest-ssl: 1.5.5 + yeast: 0.1.2 + dev: false + resolution: + integrity: sha512-RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw== + /engine.io-parser/2.2.0: + dependencies: + after: 0.8.2 + arraybuffer.slice: 0.0.7 + base64-arraybuffer: 0.1.5 + blob: 0.0.5 + has-binary2: 1.0.3 + dev: false + resolution: + integrity: sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w== + /engine.io/3.4.1: + dependencies: + accepts: 1.3.7 + base64id: 2.0.0 + cookie: 0.3.1 + debug: 4.1.1 + engine.io-parser: 2.2.0 + ws: 7.2.5 + dev: false + engines: + node: '>=8.0.0' + resolution: + integrity: sha512-8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw== + /escape-html/1.0.3: + dev: false + resolution: + integrity: sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + /etag/1.8.1: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + /express-handlebars/4.0.3: + dependencies: + glob: 7.1.6 + graceful-fs: 4.2.3 + handlebars: 4.7.6 + object.assign: 4.1.0 + promise: 8.1.0 + dev: false + engines: + node: '>=0.10' + resolution: + integrity: sha512-XSAQRreb0LzzSAQG7DRCaidqWYdtfOjgHF6VTaN7p6FaUVfFZq4Ki2d5q8WO3cdsEqbYBV69XzG+FRHzNukwiQ== + /express-session/1.17.1: + dependencies: + cookie: 0.4.0 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 2.0.0 + on-headers: 1.0.2 + parseurl: 1.3.3 + safe-buffer: 5.2.0 + uid-safe: 2.1.5 + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q== + /express/4.17.1: + dependencies: + accepts: 1.3.7 + array-flatten: 1.1.1 + body-parser: 1.19.0 + content-disposition: 0.5.3 + content-type: 1.0.4 + cookie: 0.4.0 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 1.1.2 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + finalhandler: 1.1.2 + fresh: 0.5.2 + merge-descriptors: 1.0.1 + methods: 1.1.2 + on-finished: 2.3.0 + parseurl: 1.3.3 + path-to-regexp: 0.1.7 + proxy-addr: 2.0.5 + qs: 6.7.0 + range-parser: 1.2.1 + safe-buffer: 5.1.2 + send: 0.17.1 + serve-static: 1.14.1 + setprototypeof: 1.1.1 + statuses: 1.5.0 + type-is: 1.6.18 + utils-merge: 1.0.1 + vary: 1.1.2 + dev: false + engines: + node: '>= 0.10.0' + resolution: + integrity: sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + /extend/3.0.2: + dev: false + resolution: + integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + /extsprintf/1.3.0: + dev: false + engines: + '0': node >=0.6.0 + resolution: + integrity: sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + /extsprintf/1.4.0: + dev: false + engines: + '0': node >=0.6.0 + resolution: + integrity: sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + /fast-deep-equal/3.1.1: + dev: false + resolution: + integrity: sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + /fast-json-stable-stringify/2.1.0: + dev: false + resolution: + integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + /finalhandler/1.1.2: + dependencies: + debug: 2.6.9 + encodeurl: 1.0.2 + escape-html: 1.0.3 + on-finished: 2.3.0 + parseurl: 1.3.3 + statuses: 1.5.0 + unpipe: 1.0.0 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + /forever-agent/0.6.1: + dev: false + resolution: + integrity: sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + /form-data/2.3.3: + dependencies: + asynckit: 0.4.0 + combined-stream: 1.0.8 + mime-types: 2.1.27 + dev: false + engines: + node: '>= 0.12' + resolution: + integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + /forwarded/0.1.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= + /fresh/0.5.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + /fs-minipass/1.2.7: + dependencies: + minipass: 2.9.0 + dev: false + resolution: + integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + /fs.realpath/1.0.0: + dev: false + resolution: + integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + /function-bind/1.1.1: + dev: false + resolution: + integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + /gauge/2.7.4: + dependencies: + aproba: 1.2.0 + console-control-strings: 1.1.0 + has-unicode: 2.0.1 + object-assign: 4.1.1 + signal-exit: 3.0.3 + string-width: 1.0.2 + strip-ansi: 3.0.1 + wide-align: 1.1.3 + dev: false + resolution: + integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + /getpass/0.1.7: + dependencies: + assert-plus: 1.0.0 + dev: false + resolution: + integrity: sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + /glob/7.1.6: + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 3.0.4 + once: 1.4.0 + path-is-absolute: 1.0.1 + dev: false + resolution: + integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + /graceful-fs/4.2.3: + dev: false + resolution: + integrity: sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + /handlebars/4.7.6: + dependencies: + minimist: 1.2.5 + neo-async: 2.6.1 + source-map: 0.6.1 + wordwrap: 1.0.0 + dev: false + engines: + node: '>=0.4.7' + hasBin: true + optionalDependencies: + uglify-js: 3.9.1 + resolution: + integrity: sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA== + /har-schema/2.0.0: + dev: false + engines: + node: '>=4' + resolution: + integrity: sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + /har-validator/5.1.3: + dependencies: + ajv: 6.12.2 + har-schema: 2.0.0 + dev: false + engines: + node: '>=6' + resolution: + integrity: sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + /has-binary2/1.0.3: + dependencies: + isarray: 2.0.1 + dev: false + resolution: + integrity: sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== + /has-cors/1.1.0: + dev: false + resolution: + integrity: sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= + /has-symbols/1.0.1: + dev: false + engines: + node: '>= 0.4' + resolution: + integrity: sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== + /has-unicode/2.0.1: + dev: false + resolution: + integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + /http-errors/1.7.2: + dependencies: + depd: 1.1.2 + inherits: 2.0.3 + setprototypeof: 1.1.1 + statuses: 1.5.0 + toidentifier: 1.0.0 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + /http-errors/1.7.3: + dependencies: + depd: 1.1.2 + inherits: 2.0.4 + setprototypeof: 1.1.1 + statuses: 1.5.0 + toidentifier: 1.0.0 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + /http-signature/1.2.0: + dependencies: + assert-plus: 1.0.0 + jsprim: 1.4.1 + sshpk: 1.16.1 + dev: false + engines: + node: '>=0.8' + npm: '>=1.3.7' + resolution: + integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + /iconv-lite/0.4.24: + dependencies: + safer-buffer: 2.1.2 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + /ignore-walk/3.0.3: + dependencies: + minimatch: 3.0.4 + dev: false + resolution: + integrity: sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + /indexof/0.0.1: + dev: false + resolution: + integrity: sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= + /inflight/1.0.6: + dependencies: + once: 1.4.0 + wrappy: 1.0.2 + dev: false + resolution: + integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + /inherits/2.0.3: + dev: false + resolution: + integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + /inherits/2.0.4: + dev: false + resolution: + integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + /ini/1.3.5: + dev: false + resolution: + integrity: sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + /ipaddr.js/1.9.0: + dev: false + engines: + node: '>= 0.10' + resolution: + integrity: sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== + /is-fullwidth-code-point/1.0.0: + dependencies: + number-is-nan: 1.0.1 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + /is-fullwidth-code-point/2.0.0: + dev: false + engines: + node: '>=4' + resolution: + integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + /is-typedarray/1.0.0: + dev: false + resolution: + integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + /isarray/1.0.0: + dev: false + resolution: + integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + /isarray/2.0.1: + dev: false + resolution: + integrity: sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= + /isstream/0.1.2: + dev: false + resolution: + integrity: sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + /jsbn/0.1.1: + dev: false + resolution: + integrity: sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + /json-schema-traverse/0.4.1: + dev: false + resolution: + integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + /json-schema/0.2.3: + dev: false + resolution: + integrity: sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + /json-stringify-safe/5.0.1: + dev: false + resolution: + integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + /jsprim/1.4.1: + dependencies: + assert-plus: 1.0.0 + extsprintf: 1.3.0 + json-schema: 0.2.3 + verror: 1.10.0 + dev: false + engines: + '0': node >=0.6.0 + resolution: + integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + /lodash/4.17.15: + dev: false + resolution: + integrity: sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + /media-typer/0.3.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + /merge-descriptors/1.0.1: + dev: false + resolution: + integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + /methods/1.1.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + /mime-db/1.42.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== + /mime-db/1.44.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== + /mime-types/2.1.25: + dependencies: + mime-db: 1.42.0 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg== + /mime-types/2.1.27: + dependencies: + mime-db: 1.44.0 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + /mime/1.6.0: + dev: false + engines: + node: '>=4' + hasBin: true + resolution: + integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + /minimatch/3.0.4: + dependencies: + brace-expansion: 1.1.11 + dev: false + resolution: + integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + /minimist/1.2.5: + dev: false + resolution: + integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + /minipass/2.9.0: + dependencies: + safe-buffer: 5.2.0 + yallist: 3.1.1 + dev: false + resolution: + integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + /minizlib/1.3.3: + dependencies: + minipass: 2.9.0 + dev: false + resolution: + integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + /mkdirp/0.5.5: + dependencies: + minimist: 1.2.5 + dev: false + hasBin: true + resolution: + integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + /ms/2.0.0: + dev: false + resolution: + integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + /ms/2.1.1: + dev: false + resolution: + integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + /ms/2.1.2: + dev: false + resolution: + integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + /nan/2.14.1: + dev: false + resolution: + integrity: sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== + /needle/2.4.1: + dependencies: + debug: 3.2.6 + iconv-lite: 0.4.24 + sax: 1.2.4 + dev: false + engines: + node: '>= 4.4.x' + hasBin: true + resolution: + integrity: sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g== + /negotiator/0.6.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + /neo-async/2.6.1: + dev: false + resolution: + integrity: sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + /node-pre-gyp/0.11.0: + dependencies: + detect-libc: 1.0.3 + mkdirp: 0.5.5 + needle: 2.4.1 + nopt: 4.0.3 + npm-packlist: 1.4.8 + npmlog: 4.1.2 + rc: 1.2.8 + rimraf: 2.7.1 + semver: 5.7.1 + tar: 4.4.13 + dev: false + hasBin: true + resolution: + integrity: sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== + /nopt/4.0.3: + dependencies: + abbrev: 1.1.1 + osenv: 0.1.5 + dev: false + hasBin: true + resolution: + integrity: sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== + /npm-bundled/1.1.1: + dependencies: + npm-normalize-package-bin: 1.0.1 + dev: false + resolution: + integrity: sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + /npm-normalize-package-bin/1.0.1: + dev: false + resolution: + integrity: sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + /npm-packlist/1.4.8: + dependencies: + ignore-walk: 3.0.3 + npm-bundled: 1.1.1 + npm-normalize-package-bin: 1.0.1 + dev: false + resolution: + integrity: sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== + /npmlog/4.1.2: + dependencies: + are-we-there-yet: 1.1.5 + console-control-strings: 1.1.0 + gauge: 2.7.4 + set-blocking: 2.0.0 + dev: false + resolution: + integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + /number-is-nan/1.0.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + /oauth-sign/0.9.0: + dev: false + resolution: + integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + /object-assign/4.1.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + /object-component/0.0.3: + dev: false + resolution: + integrity: sha1-8MaapQ78lbhmwYb0AKM3acsvEpE= + /object-keys/1.1.1: + dev: false + engines: + node: '>= 0.4' + resolution: + integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + /object.assign/4.1.0: + dependencies: + define-properties: 1.1.3 + function-bind: 1.1.1 + has-symbols: 1.0.1 + object-keys: 1.1.1 + dev: false + engines: + node: '>= 0.4' + resolution: + integrity: sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== + /on-finished/2.3.0: + dependencies: + ee-first: 1.1.1 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + /on-headers/1.0.2: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + /once/1.4.0: + dependencies: + wrappy: 1.0.2 + dev: false + resolution: + integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + /os-homedir/1.0.2: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + /os-tmpdir/1.0.2: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + /osenv/0.1.5: + dependencies: + os-homedir: 1.0.2 + os-tmpdir: 1.0.2 + dev: false + resolution: + integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + /parseqs/0.0.5: + dependencies: + better-assert: 1.0.2 + dev: false + resolution: + integrity: sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0= + /parseuri/0.0.5: + dependencies: + better-assert: 1.0.2 + dev: false + resolution: + integrity: sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo= + /parseurl/1.3.3: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + /path-is-absolute/1.0.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + /path-to-regexp/0.1.7: + dev: false + resolution: + integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + /performance-now/2.1.0: + dev: false + resolution: + integrity: sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + /process-nextick-args/2.0.1: + dev: false + resolution: + integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + /promise/8.1.0: + dependencies: + asap: 2.0.6 + dev: false + resolution: + integrity: sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== + /proxy-addr/2.0.5: + dependencies: + forwarded: 0.1.2 + ipaddr.js: 1.9.0 + dev: false + engines: + node: '>= 0.10' + resolution: + integrity: sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== + /psl/1.8.0: + dev: false + resolution: + integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + /punycode/2.1.1: + dev: false + engines: + node: '>=6' + resolution: + integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + /qs/6.5.2: + dev: false + engines: + node: '>=0.6' + resolution: + integrity: sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + /qs/6.7.0: + dev: false + engines: + node: '>=0.6' + resolution: + integrity: sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + /random-bytes/1.0.0: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-T2ih3Arli9P7lYSMMDJNt11kNgs= + /range-parser/1.2.1: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + /raw-body/2.4.0: + dependencies: + bytes: 3.1.0 + http-errors: 1.7.2 + iconv-lite: 0.4.24 + unpipe: 1.0.0 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + /rc/1.2.8: + dependencies: + deep-extend: 0.6.0 + ini: 1.3.5 + minimist: 1.2.5 + strip-json-comments: 2.0.1 + dev: false + hasBin: true + resolution: + integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + /readable-stream/2.3.7: + dependencies: + core-util-is: 1.0.2 + inherits: 2.0.4 + isarray: 1.0.0 + process-nextick-args: 2.0.1 + safe-buffer: 5.1.2 + string_decoder: 1.1.1 + util-deprecate: 1.0.2 + dev: false + resolution: + integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + /request/2.88.2: + dependencies: + aws-sign2: 0.7.0 + aws4: 1.9.1 + caseless: 0.12.0 + combined-stream: 1.0.8 + extend: 3.0.2 + forever-agent: 0.6.1 + form-data: 2.3.3 + har-validator: 5.1.3 + http-signature: 1.2.0 + is-typedarray: 1.0.0 + isstream: 0.1.2 + json-stringify-safe: 5.0.1 + mime-types: 2.1.27 + oauth-sign: 0.9.0 + performance-now: 2.1.0 + qs: 6.5.2 + safe-buffer: 5.2.0 + tough-cookie: 2.5.0 + tunnel-agent: 0.6.0 + uuid: 3.4.0 + deprecated: 'request has been deprecated, see https://github.com/request/request/issues/3142' + dev: false + engines: + node: '>= 6' + resolution: + integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + /rimraf/2.7.1: + dependencies: + glob: 7.1.6 + dev: false + hasBin: true + resolution: + integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + /safe-buffer/5.1.2: + dev: false + resolution: + integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + /safe-buffer/5.2.0: + dev: false + resolution: + integrity: sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + /safer-buffer/2.1.2: + dev: false + resolution: + integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + /sax/1.2.4: + dev: false + resolution: + integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + /semver/5.7.1: + dev: false + hasBin: true + resolution: + integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + /send/0.17.1: + dependencies: + debug: 2.6.9 + depd: 1.1.2 + destroy: 1.0.4 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + fresh: 0.5.2 + http-errors: 1.7.3 + mime: 1.6.0 + ms: 2.1.1 + on-finished: 2.3.0 + range-parser: 1.2.1 + statuses: 1.5.0 + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + /serve-static/1.14.1: + dependencies: + encodeurl: 1.0.2 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 0.17.1 + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + /set-blocking/2.0.0: + dev: false + resolution: + integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + /setprototypeof/1.1.1: + dev: false + resolution: + integrity: sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + /signal-exit/3.0.3: + dev: false + resolution: + integrity: sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + /socket.io-adapter/1.1.2: + dev: false + resolution: + integrity: sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== + /socket.io-client/2.3.0: + dependencies: + backo2: 1.0.2 + base64-arraybuffer: 0.1.5 + component-bind: 1.0.0 + component-emitter: 1.2.1 + debug: 4.1.1 + engine.io-client: 3.4.1 + has-binary2: 1.0.3 + has-cors: 1.1.0 + indexof: 0.0.1 + object-component: 0.0.3 + parseqs: 0.0.5 + parseuri: 0.0.5 + socket.io-parser: 3.3.0 + to-array: 0.1.4 + dev: false + resolution: + integrity: sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA== + /socket.io-express-session/0.1.3: + dev: false + resolution: + integrity: sha1-bXlOrpdz4OHzSv/awD5GXbmRZnQ= + /socket.io-parser/3.3.0: + dependencies: + component-emitter: 1.2.1 + debug: 3.1.0 + isarray: 2.0.1 + dev: false + resolution: + integrity: sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng== + /socket.io-parser/3.4.0: + dependencies: + component-emitter: 1.2.1 + debug: 4.1.1 + isarray: 2.0.1 + dev: false + resolution: + integrity: sha512-/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ== + /socket.io/2.3.0: + dependencies: + debug: 4.1.1 + engine.io: 3.4.1 + has-binary2: 1.0.3 + socket.io-adapter: 1.1.2 + socket.io-client: 2.3.0 + socket.io-parser: 3.4.0 + dev: false + resolution: + integrity: sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg== + /source-map/0.6.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + /sqlite3/4.1.1: + dependencies: + nan: 2.14.1 + node-pre-gyp: 0.11.0 + request: 2.88.2 + dev: false + requiresBuild: true + resolution: + integrity: sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg== + /sshpk/1.16.1: + dependencies: + asn1: 0.2.4 + assert-plus: 1.0.0 + bcrypt-pbkdf: 1.0.2 + dashdash: 1.14.1 + ecc-jsbn: 0.1.2 + getpass: 0.1.7 + jsbn: 0.1.1 + safer-buffer: 2.1.2 + tweetnacl: 0.14.5 + dev: false + engines: + node: '>=0.10.0' + hasBin: true + resolution: + integrity: sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + /statuses/1.5.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + /string-width/1.0.2: + dependencies: + code-point-at: 1.1.0 + is-fullwidth-code-point: 1.0.0 + strip-ansi: 3.0.1 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + /string-width/2.1.1: + dependencies: + is-fullwidth-code-point: 2.0.0 + strip-ansi: 4.0.0 + dev: false + engines: + node: '>=4' + resolution: + integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + /string_decoder/1.1.1: + dependencies: + safe-buffer: 5.1.2 + dev: false + resolution: + integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + /strip-ansi/3.0.1: + dependencies: + ansi-regex: 2.1.1 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + /strip-ansi/4.0.0: + dependencies: + ansi-regex: 3.0.0 + dev: false + engines: + node: '>=4' + resolution: + integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= + /strip-json-comments/2.0.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= + /tar/4.4.13: + dependencies: + chownr: 1.1.4 + fs-minipass: 1.2.7 + minipass: 2.9.0 + minizlib: 1.3.3 + mkdirp: 0.5.5 + safe-buffer: 5.2.0 + yallist: 3.1.1 + dev: false + engines: + node: '>=4.5' + resolution: + integrity: sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + /to-array/0.1.4: + dev: false + resolution: + integrity: sha1-F+bBH3PdTz10zaek/zI46a2b+JA= + /toidentifier/1.0.0: + dev: false + engines: + node: '>=0.6' + resolution: + integrity: sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + /tough-cookie/2.5.0: + dependencies: + psl: 1.8.0 + punycode: 2.1.1 + dev: false + engines: + node: '>=0.8' + resolution: + integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + /tunnel-agent/0.6.0: + dependencies: + safe-buffer: 5.2.0 + dev: false + resolution: + integrity: sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + /tweetnacl/0.14.5: + dev: false + resolution: + integrity: sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + /type-is/1.6.18: + dependencies: + media-typer: 0.3.0 + mime-types: 2.1.25 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + /uglify-js/3.9.1: + dependencies: + commander: 2.20.3 + dev: false + engines: + node: '>=0.8.0' + hasBin: true + optional: true + resolution: + integrity: sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA== + /uid-safe/2.1.5: + dependencies: + random-bytes: 1.0.0 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA== + /unpipe/1.0.0: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + /uri-js/4.2.2: + dependencies: + punycode: 2.1.1 + dev: false + resolution: + integrity: sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + /util-deprecate/1.0.2: + dev: false + resolution: + integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + /utils-merge/1.0.1: + dev: false + engines: + node: '>= 0.4.0' + resolution: + integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + /uuid/3.4.0: + dev: false + hasBin: true + resolution: + integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + /vary/1.1.2: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + /verror/1.10.0: + dependencies: + assert-plus: 1.0.0 + core-util-is: 1.0.2 + extsprintf: 1.4.0 + dev: false + engines: + '0': node >=0.6.0 + resolution: + integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + /wide-align/1.1.3: + dependencies: + string-width: 2.1.1 + dev: false + resolution: + integrity: sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + /wordwrap/1.0.0: + dev: false + resolution: + integrity: sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + /wrappy/1.0.2: + dev: false + resolution: + integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + /ws/6.1.4: + dependencies: + async-limiter: 1.0.1 + dev: false + resolution: + integrity: sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA== + /ws/7.2.5: + dev: false + engines: + node: '>=8.3.0' + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + resolution: + integrity: sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA== + /xmlhttprequest-ssl/1.5.5: + dev: false + engines: + node: '>=0.4.0' + resolution: + integrity: sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= + /yallist/3.1.1: + dev: false + resolution: + integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + /yeast/0.1.2: + dev: false + resolution: + integrity: sha1-AI4G2AlDIMNy28L47XagymyKxBk= +registry: 'https://registry.npmjs.org/' +shrinkwrapMinorVersion: 9 +shrinkwrapVersion: 3 +specifiers: + body-parser: ^1.19.0 + connect-sqlite3: ^0.9.11 + endb: ^0.22.9 + express: ^4.17.1 + express-handlebars: ^4.0.3 + express-session: ^1.17.1 + handlebars: ^4.7.6 + socket.io: ^2.3.0 + socket.io-express-session: ^0.1.3 diff --git a/views/index.html b/views/index.html new file mode 100644 index 0000000..d1ee071 --- /dev/null +++ b/views/index.html @@ -0,0 +1,15 @@ +
+ {{{stations}}} +
+
+

+ No song playing +

+
+ +
+
+ No station +
+ +
\ No newline at end of file diff --git a/views/layouts/main.html b/views/layouts/main.html new file mode 100644 index 0000000..127b1e2 --- /dev/null +++ b/views/layouts/main.html @@ -0,0 +1,21 @@ + + + + {{display_brand}} + + + + + + + + + +
+ + {{{body}}} +
+ + \ No newline at end of file diff --git a/views/station.html b/views/station.html new file mode 100644 index 0000000..ed2df9a --- /dev/null +++ b/views/station.html @@ -0,0 +1,3 @@ +
+ {{name}} +
From 1b2c5ed458a6d9c51f6f1753c8229c6a29602424 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Thu, 21 May 2020 18:06:09 +0000 Subject: [PATCH 02/29] Page generation finished, secret control click added --- public/script.js | 24 +++++++++++-------- public/style.css | 27 +++++++++++++++------ server.js | 60 +++++++++++++++++++++++----------------------- views/index.html | 10 ++++---- views/station.html | 5 +++- 5 files changed, 73 insertions(+), 53 deletions(-) diff --git a/public/script.js b/public/script.js index 85749cd..27bab3f 100644 --- a/public/script.js +++ b/public/script.js @@ -1,10 +1,14 @@ -// client-side js, loaded by index.html -// run by the browser each time the page is loaded - -console.log("hello empowered world"); -let dotsIter = 0; -const dotsAnimation = [".","..","..."] -setInterval(function(){ - $(".dots-animate").html(dotsAnimation[dotsIter % dotsAnimation.length]) - dotsIter = (dotsIter + 1) % dotsAnimation.length; -},500) \ No newline at end of file +function controllerclick(event) { + console.log("Clicked"); + console.log(event); + if(event.ctrlKey){ + $("#streamelem").toggle(); + }else{ + + } + } +$(function() { + $("#streamelem").hide(); + let controller = document.getElementById("controller"); + controller.addEventListener("click", controllerclick); +}); diff --git a/public/style.css b/public/style.css index 58c29a1..d9aef60 100644 --- a/public/style.css +++ b/public/style.css @@ -37,7 +37,7 @@ input { form button { background-color: #bbbbf2; border: 2px solid currentColor; - border-radius: .25em; + border-radius: 0.25em; cursor: pointer; font-size: inherit; line-height: 1.4em; @@ -54,17 +54,30 @@ footer { padding-top: 1.5em; border-top: 1px solid lightgrey; } -.codelist > li{ +.codelist > li { font-family: Consolas, Courier; } -.white{ +.white { color: white; background: gray; margin: 0px; font-weight: lighter; } -.spaced{ - padding: 8px;4} -.center { - text-align-last: center; +.spaced { + padding: 8px; +} +.spaced-2x { + padding: 12px; +} +.center { + text-align-last: center; +} +.whitecolor { + color: white; +} +.station { + background-color: purple; +} +#streamelem{ + width: 100%; } \ No newline at end of file diff --git a/server.js b/server.js index 23de49c..26cd06d 100644 --- a/server.js +++ b/server.js @@ -1,8 +1,4 @@ -// server.js -// where your node app starts - -// we've started you off with Express (https://expressjs.com/) -// but feel free to use whatever libraries or frameworks you'd like through `package.json`. +// OpenRadio const express = require("express"); const app = express(); const path = require("path"); @@ -13,50 +9,54 @@ app.engine(".html", exphbs({ extname: ".html" })); app.set("view engine", ".html"); var SQLiteStore = require("connect-sqlite3")(session); let sess = session({ - store: new SQLiteStore(), - secret: process.env.SECRET, - cookie: { maxAge: 7 * 24 * 60 * 60 * 1000 }, - resave: true, - saveUninitialized: false - }); -app.use( - sess -); + store: new SQLiteStore(), + secret: process.env.SECRET, + cookie: { maxAge: 7 * 24 * 60 * 60 * 1000 }, + resave: true, + saveUninitialized: false +}); +app.use(sess); var bodyParser = require("body-parser"); app.use(bodyParser.json()); // support json encoded bodies app.use(bodyParser.urlencoded({ extended: true })); // support encoded bodies -var http = require('http').createServer(app); +var http = require("http").createServer(app); //var server = http.Server(app); -var io = require('socket.io')(http); +var io = require("socket.io")(http); // Setup sessions for socketio -var ios = require('socket.io-express-session'); +var ios = require("socket.io-express-session"); io.use(ios(sess)); // make all the files in 'public' available // https://expressjs.com/en/starter/static-files.html var fs = require("fs"); -var stationtemplate = fs.readFileSync(__dirname+'/views/station.html',"utf8"); +var stationtemplate = fs.readFileSync( + __dirname + "/views/station.html", + "utf8" +); +console.log(stationtemplate); const Handlebars = require("handlebars"); var template = Handlebars.compile(stationtemplate); app.use(express.static("public")); // Testing streams let streams = ["test"]; -// https://expressjs.com/en/starter/basic-routing.html app.get("/", (req, res) => { - let output = "" - for(var i =0 ; i < streams; i ++){ - + let output = ""; + for (var i = 0; i < streams.length; i++) { + output = + output + + template({ name: streams[i], streamaudiopath: "/stream/" + streams[i] }); } - res.render(__dirname + "/views/index.html", {...config.webexports, ...{stations: output}}); + console.log(output); + res.render(__dirname + "/views/index.html", { + ...config.webexports, + ...{ stations: output } + }); }); -app.get("/stream/:name",async function(req,res){ +app.get("/stream/:name", async function(req, res) { let name = req.params.name; - if(name == "test"){ - - } + if (name == "test") { + } res.send(req.params.name); -}) - - +}); // listen for requests :) const listener = http.listen(process.env.PORT, () => { console.log("Your app is listening on port " + listener.address().port); diff --git a/views/index.html b/views/index.html index d1ee071..d164018 100644 --- a/views/index.html +++ b/views/index.html @@ -1,15 +1,15 @@
{{{stations}}} +
-

- No song playing +

+ No song playing

-
+
No station
- -
\ No newline at end of file +
diff --git a/views/station.html b/views/station.html index ed2df9a..b6574b7 100644 --- a/views/station.html +++ b/views/station.html @@ -1,3 +1,6 @@ -
+
{{name}} +
+ +
From 774e04e5b09107a8276fd84c6f62c6fea1f1668f Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Thu, 21 May 2020 19:44:14 +0000 Subject: [PATCH 03/29] Commit before setup interval chunk send --- config.js | 3 ++- contentHandler.js | 7 +++++++ package.json | 5 +++-- server.js | 29 +++++++++++++++++++++++++---- shrinkwrap.yaml | 32 ++++++++++++++++++++++++++++++++ utils.js | 23 +++++++++++++++++++++++ 6 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 contentHandler.js create mode 100644 utils.js diff --git a/config.js b/config.js index a17e0ca..0b53508 100644 --- a/config.js +++ b/config.js @@ -2,5 +2,6 @@ module.exports = { "brand":"OpenRadio", "webexports":{ "display_brand":"OpenRadio" - } + }, + "sendInterval": 1000 } \ No newline at end of file diff --git a/contentHandler.js b/contentHandler.js new file mode 100644 index 0000000..f9f5911 --- /dev/null +++ b/contentHandler.js @@ -0,0 +1,7 @@ +const ytdl = require('ytdl-core'); +function retrieveStream(identifier){ + if(identifier.startsWith("https://youtube.com") || identifier.startsWith("http://youtube.com") || identifier.startsWith("youtube.com") || identifier.startsWith("https://www.youtube.com") || identifier.startsWith("http://www.youtube.com") ){ + return ytdl(identifier, { filter: 'audioonly'}); + } +} +module.exports = {retrieveStream: retrieveStream}; \ No newline at end of file diff --git a/package.json b/package.json index cde12a5..d94a6b5 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,11 @@ "express-handlebars": "^4.0.3", "socket.io-express-session": "^0.1.3", "body-parser": "^1.19.0", - "connect-sqlite3": "^0.9.11" + "connect-sqlite3": "^0.9.11", + "ytdl-core": "^2.1.4" }, "engines": { - "node": "12.x" + "node": "10.x" }, "repository": { "url": "https://glitch.com/edit/#!/empowered-express" diff --git a/server.js b/server.js index 26cd06d..41ea3aa 100644 --- a/server.js +++ b/server.js @@ -2,9 +2,11 @@ const express = require("express"); const app = express(); const path = require("path"); +const {MultiWritable} = require("./utils"); var session = require("express-session"); const exphbs = require("express-handlebars"); const config = require("./config"); +var { retrieveStream } = require("./contentHandler"); app.engine(".html", exphbs({ extname: ".html" })); app.set("view engine", ".html"); var SQLiteStore = require("connect-sqlite3")(session); @@ -37,7 +39,10 @@ const Handlebars = require("handlebars"); var template = Handlebars.compile(stationtemplate); app.use(express.static("public")); // Testing streams -let streams = ["test"]; +let playlists = { test: ["https://www.youtube.com/watch?v=oJuGlqO85YI"] }; +let contentStreams = {}; +let streams = Object.keys(playlists); +console.log("Init Handlers"); app.get("/", (req, res) => { let output = ""; for (var i = 0; i < streams.length; i++) { @@ -45,17 +50,33 @@ app.get("/", (req, res) => { output + template({ name: streams[i], streamaudiopath: "/stream/" + streams[i] }); } - console.log(output); + //console.log(output); res.render(__dirname + "/views/index.html", { ...config.webexports, ...{ stations: output } }); }); +const PassThrough = require("stream").PassThrough; app.get("/stream/:name", async function(req, res) { + res.set({ + "Content-Type": "audio/mpeg3", + "Transfer-Encoding": "chunked" + }); let name = req.params.name; - if (name == "test") { + console.log("Serving Stream "+name) + if (!Object.keys(contentStreams).includes(name)) { + let rawStream = retrieveStream( + playlists[name][Math.floor(Math.random() * playlists[name].length)] + ); + let outputStream = new MultiWritable(); + rawStream.pipe(outputStream); + contentStreams[name] = outputStream; } - res.send(req.params.name); + contentStreams[name].consumers.push(res); + req.on("close", function() { + contentStreams[name].consumers = contentStreams[name].consumers.filter(x => x!=res); + }); + //res.send(req.params.name); }); // listen for requests :) const listener = http.listen(process.env.PORT, () => { diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 7f39c01..acc9db0 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -8,6 +8,7 @@ dependencies: handlebars: 4.7.6 socket.io: 2.3.0 socket.io-express-session: 0.1.3 + ytdl-core: 2.1.4 packages: /abbrev/1.1.1: dev: false @@ -638,6 +639,10 @@ packages: dev: false resolution: integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + /html-entities/1.3.1: + dev: false + resolution: + integrity: sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== /http-errors/1.7.2: dependencies: depd: 1.1.2 @@ -777,6 +782,15 @@ packages: dev: false resolution: integrity: sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + /m3u8stream/0.7.1: + dependencies: + miniget: 1.7.0 + sax: 1.2.4 + dev: false + engines: + node: '>=10' + resolution: + integrity: sha512-z6ldnAdhbuWOL6LmMkwptSZGzj+qbRytMKLTbNicwF/bJMjf9U9lqD57RNQUFecvWadEkzy6PDjcNJFFgi19uQ== /media-typer/0.3.0: dev: false engines: @@ -828,6 +842,12 @@ packages: hasBin: true resolution: integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + /miniget/1.7.0: + dev: false + engines: + node: '>=10' + resolution: + integrity: sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA== /minimatch/3.0.4: dependencies: brace-expansion: 1.1.11 @@ -1534,6 +1554,17 @@ packages: dev: false resolution: integrity: sha1-AI4G2AlDIMNy28L47XagymyKxBk= + /ytdl-core/2.1.4: + dependencies: + html-entities: 1.3.1 + m3u8stream: 0.7.1 + miniget: 1.7.0 + sax: 1.2.4 + dev: false + engines: + node: '>=10' + resolution: + integrity: sha512-jjxOAfOsUE4tXLrjZeLnvhvMeuE31TpvhP/SHmERNH+s5aDK5oseons8iplRrfxrkh+Gj4QKGzXf06gLMdBvIA== registry: 'https://registry.npmjs.org/' shrinkwrapMinorVersion: 9 shrinkwrapVersion: 3 @@ -1547,3 +1578,4 @@ specifiers: handlebars: ^4.7.6 socket.io: ^2.3.0 socket.io-express-session: ^0.1.3 + ytdl-core: ^2.1.4 diff --git a/utils.js b/utils.js new file mode 100644 index 0000000..5ddf413 --- /dev/null +++ b/utils.js @@ -0,0 +1,23 @@ +const Writable = require("stream").Writable; +const {sendInterval} = require("./config"); +class MultiWritable extends Writable { + constructor(options) { + super(options); + this.consumers = []; + } + + write(chunk, encoding, callback) { + let count = 0; + let total = this.consumers.length; + for (var i = 0; i < total; i++) { + console.log("CHUNK!"); + this.consumers[i].write(chunk, encoding, function() { + count++; + if (count == total && callback) { + callback(); + } + }); + } + } +} +module.exports = { MultiWritable: MultiWritable }; From f1f9eecac17834d62ddf234208bad822621dfd14 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Thu, 21 May 2020 22:56:37 +0000 Subject: [PATCH 04/29] working just need to figure out nums --- config.js | 3 ++- contentHandler.js | 17 +++++++++++----- package.json | 3 ++- server.js | 28 ++++++++++++++++++++------ shrinkwrap.yaml | 26 ++++++++++++++++++++++++ utils.js | 51 +++++++++++++++++++++++++++++++++++++---------- 6 files changed, 104 insertions(+), 24 deletions(-) diff --git a/config.js b/config.js index 0b53508..38620de 100644 --- a/config.js +++ b/config.js @@ -3,5 +3,6 @@ module.exports = { "webexports":{ "display_brand":"OpenRadio" }, - "sendInterval": 1000 + "chunkSize": 1024*3, + "sendInterval": 1000*256// 1024*3/12 = 256 } \ No newline at end of file diff --git a/contentHandler.js b/contentHandler.js index f9f5911..851f2f1 100644 --- a/contentHandler.js +++ b/contentHandler.js @@ -1,7 +1,14 @@ -const ytdl = require('ytdl-core'); -function retrieveStream(identifier){ - if(identifier.startsWith("https://youtube.com") || identifier.startsWith("http://youtube.com") || identifier.startsWith("youtube.com") || identifier.startsWith("https://www.youtube.com") || identifier.startsWith("http://www.youtube.com") ){ - return ytdl(identifier, { filter: 'audioonly'}); +const ytdl = require("ytdl-core"); +function retrieveStream(identifier) { + if ( + identifier.startsWith("https://youtube.com") || + identifier.startsWith("http://youtube.com") || + identifier.startsWith("youtube.com") || + identifier.startsWith("https://www.youtube.com") || + identifier.startsWith("http://www.youtube.com") + ) { + //return ytdl(identifier, { filter: 'audioonly'}); + return ytdl(identifier, { filter: format => format.container === "mp4" }); } } -module.exports = {retrieveStream: retrieveStream}; \ No newline at end of file +module.exports = { retrieveStream: retrieveStream }; diff --git a/package.json b/package.json index d94a6b5..3faaeef 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "socket.io-express-session": "^0.1.3", "body-parser": "^1.19.0", "connect-sqlite3": "^0.9.11", - "ytdl-core": "^2.1.4" + "ytdl-core": "^2.1.4", + "fluent-ffmpeg": "^2.1.2" }, "engines": { "node": "10.x" diff --git a/server.js b/server.js index 41ea3aa..5ae7127 100644 --- a/server.js +++ b/server.js @@ -2,7 +2,7 @@ const express = require("express"); const app = express(); const path = require("path"); -const {MultiWritable} = require("./utils"); +const { MultiWritable } = require("./utils"); var session = require("express-session"); const exphbs = require("express-handlebars"); const config = require("./config"); @@ -56,26 +56,42 @@ app.get("/", (req, res) => { ...{ stations: output } }); }); +var ffmpeg = require("fluent-ffmpeg"); const PassThrough = require("stream").PassThrough; app.get("/stream/:name", async function(req, res) { res.set({ "Content-Type": "audio/mpeg3", + "Content-Range": "bytes 0-", "Transfer-Encoding": "chunked" }); let name = req.params.name; - console.log("Serving Stream "+name) + console.log("Serving Stream " + name); if (!Object.keys(contentStreams).includes(name)) { let rawStream = retrieveStream( playlists[name][Math.floor(Math.random() * playlists[name].length)] ); - let outputStream = new MultiWritable(); - rawStream.pipe(outputStream); + + var command = ffmpeg(); + let outputStream = new MultiWritable({highWaterMark: config.chunkSize}); + + var tp = ffmpeg(rawStream) + .withNoVideo() + .inputFormat("m4a") + .audioCodec("libmp3lame") + .audioBitrate(128) + .format("mp3") + .on("error", err => console.error(err)) + .on("end", () => console.log("Finished!")) + .save(outputStream); // FFmpeg chain + //rawStream.pipe(outputStream); contentStreams[name] = outputStream; } contentStreams[name].consumers.push(res); req.on("close", function() { - contentStreams[name].consumers = contentStreams[name].consumers.filter(x => x!=res); - }); + contentStreams[name].consumers = contentStreams[name].consumers.filter( + x => x != res + ); + }); //res.send(req.params.name); }); // listen for requests :) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index acc9db0..2c0dc6c 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -5,6 +5,7 @@ dependencies: express: 4.17.1 express-handlebars: 4.0.3 express-session: 1.17.1 + fluent-ffmpeg: 2.1.2 handlebars: 4.7.6 socket.io: 2.3.0 socket.io-express-session: 0.1.3 @@ -87,6 +88,10 @@ packages: dev: false resolution: integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + /async/3.2.0: + dev: false + resolution: + integrity: sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== /asynckit/0.4.0: dev: false resolution: @@ -516,6 +521,15 @@ packages: node: '>= 0.8' resolution: integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + /fluent-ffmpeg/2.1.2: + dependencies: + async: 3.2.0 + which: 1.3.1 + dev: false + engines: + node: '>=0.8.0' + resolution: + integrity: sha1-yVLeIkD4EuvaCqgAbXd27irPfXQ= /forever-agent/0.6.1: dev: false resolution: @@ -747,6 +761,10 @@ packages: dev: false resolution: integrity: sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= + /isexe/2.0.0: + dev: false + resolution: + integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= /isstream/0.1.2: dev: false resolution: @@ -1511,6 +1529,13 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + /which/1.3.1: + dependencies: + isexe: 2.0.0 + dev: false + hasBin: true + resolution: + integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== /wide-align/1.1.3: dependencies: string-width: 2.1.1 @@ -1575,6 +1600,7 @@ specifiers: express: ^4.17.1 express-handlebars: ^4.0.3 express-session: ^1.17.1 + fluent-ffmpeg: ^2.1.2 handlebars: ^4.7.6 socket.io: ^2.3.0 socket.io-express-session: ^0.1.3 diff --git a/utils.js b/utils.js index 5ddf413..9efcc83 100644 --- a/utils.js +++ b/utils.js @@ -1,23 +1,52 @@ const Writable = require("stream").Writable; -const {sendInterval} = require("./config"); +const { sendInterval } = require("./config"); class MultiWritable extends Writable { constructor(options) { super(options); this.consumers = []; + this.sendbuffer = []; + this.started = false; } - - write(chunk, encoding, callback) { + sendChunks() { + //console.log(this.sendbuffer); + if (!this.sendbuffer) { + //console.log("Buffer not init yet") + return; + } + let data = this.sendbuffer.shift(); + //console.log(this.sendbuffer); let count = 0; let total = this.consumers.length; - for (var i = 0; i < total; i++) { - console.log("CHUNK!"); - this.consumers[i].write(chunk, encoding, function() { - count++; - if (count == total && callback) { - callback(); - } - }); + //console.log("Checking for chunks!") + console.log(data + " " + this.sendbuffer.length); + if (data) { + console.log("We have chunks "+Object.keys(data)); + let { chunk, encoding, callback } = data; + for (var i = 0; i < total; i++) { + this.consumers[i].write(chunk, encoding, function() { + count++; + if (count == total && callback) { + callback(); + } + }); + } + } + } + write(chunk, encoding, callback) { + if (!this.started) { + this.started = true; + var scope = this; + setInterval(function() { + scope.sendChunks(); + }, sendInterval); } + this.sendbuffer.push({ + chunk: chunk, + encoding: encoding, + callback: callback + }); + //console.log(this.sendbuffer); + console.log("Queued Chunk " + this.sendbuffer.length); } } module.exports = { MultiWritable: MultiWritable }; From 9b45222d7f85794882e3f95e42fe10e570387b45 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 01:50:57 +0000 Subject: [PATCH 05/29] Small optimal desync achieved WITH LOTS OF HICCUPS --- config.js | 4 ++-- server.js | 3 ++- utils.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config.js b/config.js index 38620de..689cfe1 100644 --- a/config.js +++ b/config.js @@ -3,6 +3,6 @@ module.exports = { "webexports":{ "display_brand":"OpenRadio" }, - "chunkSize": 1024*3, - "sendInterval": 1000*256// 1024*3/12 = 256 + "chunkSize": 1024 * 1024 * 10, + "sendInterval": 50 //*8// 1024*3/12 = 256 } \ No newline at end of file diff --git a/server.js b/server.js index 5ae7127..eaadaf7 100644 --- a/server.js +++ b/server.js @@ -39,7 +39,7 @@ const Handlebars = require("handlebars"); var template = Handlebars.compile(stationtemplate); app.use(express.static("public")); // Testing streams -let playlists = { test: ["https://www.youtube.com/watch?v=oJuGlqO85YI"] }; +let playlists = { test: ["https://www.youtube.com/watch?v=Gc3tqnhmf5U"] }; let contentStreams = {}; let streams = Object.keys(playlists); console.log("Init Handlers"); @@ -64,6 +64,7 @@ app.get("/stream/:name", async function(req, res) { "Content-Range": "bytes 0-", "Transfer-Encoding": "chunked" }); + res.set('Cache-Control', 'no-store') let name = req.params.name; console.log("Serving Stream " + name); if (!Object.keys(contentStreams).includes(name)) { diff --git a/utils.js b/utils.js index 9efcc83..5bfe32a 100644 --- a/utils.js +++ b/utils.js @@ -20,7 +20,7 @@ class MultiWritable extends Writable { //console.log("Checking for chunks!") console.log(data + " " + this.sendbuffer.length); if (data) { - console.log("We have chunks "+Object.keys(data)); + console.log("We have chunks " + Object.keys(data)); let { chunk, encoding, callback } = data; for (var i = 0; i < total; i++) { this.consumers[i].write(chunk, encoding, function() { From 3bf13273c81783fa588814d0de749931a4673eb8 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 02:25:21 +0000 Subject: [PATCH 06/29] Ehhh broke something --- config.js | 1 + contentHandler.js | 3 ++- server.js | 2 +- utils.js | 8 +++++--- views/index.html | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/config.js b/config.js index 689cfe1..a2877f8 100644 --- a/config.js +++ b/config.js @@ -4,5 +4,6 @@ module.exports = { "display_brand":"OpenRadio" }, "chunkSize": 1024 * 1024 * 10, + "inputChunkSize": 1024*1024*1, "sendInterval": 50 //*8// 1024*3/12 = 256 } \ No newline at end of file diff --git a/contentHandler.js b/contentHandler.js index 851f2f1..b35a376 100644 --- a/contentHandler.js +++ b/contentHandler.js @@ -1,4 +1,5 @@ const ytdl = require("ytdl-core"); +const config = require("./config"); function retrieveStream(identifier) { if ( identifier.startsWith("https://youtube.com") || @@ -8,7 +9,7 @@ function retrieveStream(identifier) { identifier.startsWith("http://www.youtube.com") ) { //return ytdl(identifier, { filter: 'audioonly'}); - return ytdl(identifier, { filter: format => format.container === "mp4" }); + return ytdl(identifier, { filter: format => format.container === "mp4", highWaterMark: config.inputChunkSize}); } } module.exports = { retrieveStream: retrieveStream }; diff --git a/server.js b/server.js index eaadaf7..a6045c4 100644 --- a/server.js +++ b/server.js @@ -75,7 +75,7 @@ app.get("/stream/:name", async function(req, res) { var command = ffmpeg(); let outputStream = new MultiWritable({highWaterMark: config.chunkSize}); - var tp = ffmpeg(rawStream) + var tp = ffmpeg(rawStream, { highWaterMark: config.inputChunkSize }) .withNoVideo() .inputFormat("m4a") .audioCodec("libmp3lame") diff --git a/utils.js b/utils.js index 5bfe32a..308c0c9 100644 --- a/utils.js +++ b/utils.js @@ -18,8 +18,9 @@ class MultiWritable extends Writable { let count = 0; let total = this.consumers.length; //console.log("Checking for chunks!") - console.log(data + " " + this.sendbuffer.length); + //console.log(data + " " + this.sendbuffer.length); if (data) { + // Chunks in Queue!!! console.log("We have chunks " + Object.keys(data)); let { chunk, encoding, callback } = data; for (var i = 0; i < total; i++) { @@ -32,10 +33,11 @@ class MultiWritable extends Writable { } } } - write(chunk, encoding, callback) { + _write(chunk, encoding, callback) { if (!this.started) { this.started = true; var scope = this; + //console.log(chunk.length); setInterval(function() { scope.sendChunks(); }, sendInterval); @@ -46,7 +48,7 @@ class MultiWritable extends Writable { callback: callback }); //console.log(this.sendbuffer); - console.log("Queued Chunk " + this.sendbuffer.length); + console.log("Queued Chunk " + this.sendbuffer.length+" chunk len "+chunk.length); } } module.exports = { MultiWritable: MultiWritable }; diff --git a/views/index.html b/views/index.html index d164018..00ba7cd 100644 --- a/views/index.html +++ b/views/index.html @@ -1,6 +1,6 @@
{{{stations}}} - +

From dc786898b56b92734a209087f28402f690eb1073 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 15:59:32 +0000 Subject: [PATCH 07/29] Autoplay working --- config.js | 4 +-- contentHandler.js | 2 +- server.js | 73 ++++++++++++++++++++++++++++++++++++----------- utils.js | 17 +++++++++-- 4 files changed, 74 insertions(+), 22 deletions(-) diff --git a/config.js b/config.js index a2877f8..777511d 100644 --- a/config.js +++ b/config.js @@ -3,7 +3,7 @@ module.exports = { "webexports":{ "display_brand":"OpenRadio" }, - "chunkSize": 1024 * 1024 * 10, - "inputChunkSize": 1024*1024*1, + "chunkSize": 1024, + "inputChunkSize": 1024, "sendInterval": 50 //*8// 1024*3/12 = 256 } \ No newline at end of file diff --git a/contentHandler.js b/contentHandler.js index b35a376..6b2ef9a 100644 --- a/contentHandler.js +++ b/contentHandler.js @@ -9,7 +9,7 @@ function retrieveStream(identifier) { identifier.startsWith("http://www.youtube.com") ) { //return ytdl(identifier, { filter: 'audioonly'}); - return ytdl(identifier, { filter: format => format.container === "mp4", highWaterMark: config.inputChunkSize}); + return ytdl(identifier, { filter: format => format.container === "mp4", highWaterMark: config.inputChunkSize, end: false}); // End: false required to prevent closing } } module.exports = { retrieveStream: retrieveStream }; diff --git a/server.js b/server.js index a6045c4..3a56a0f 100644 --- a/server.js +++ b/server.js @@ -39,7 +39,11 @@ const Handlebars = require("handlebars"); var template = Handlebars.compile(stationtemplate); app.use(express.static("public")); // Testing streams -let playlists = { test: ["https://www.youtube.com/watch?v=Gc3tqnhmf5U"] }; +let playlists = { + test: [ // "https://www.youtube.com/watch?v=B9AUUhg0Cdw", + "https://www.youtube.com/watch?v=rUWxSEwctFU" + ] +}; let contentStreams = {}; let streams = Object.keys(playlists); console.log("Init Handlers"); @@ -58,32 +62,67 @@ app.get("/", (req, res) => { }); var ffmpeg = require("fluent-ffmpeg"); const PassThrough = require("stream").PassThrough; +function playContent(name, outputStream, realOutputStream) { + console.log("Playing playlist "+name); + let rawStream = retrieveStream( + playlists[name][Math.floor(Math.random() * playlists[name].length)] + ); + let consumed = false; + realOutputStream.thinkItIsDone = function() { + console.log("It might be done"); + if (consumed) { + console.log("IT is!"); + playContent(name, outputStream, realOutputStream); + } + }; + //console.log(realOutputStream.writable); + realOutputStream.onExhaust = function() { + consumed = true; + //console.log("Count "+realOutputStream.sendBuffer.length) + console.log("Checking if buffer empty "+realOutputStream.empty); + if (realOutputStream.empty) { + console.log("Recursive Play") + + playContent(name, outputStream, realOutputStream); + } + }; + console.log(outputStream); + let processer = ffmpeg(rawStream, { highWaterMark: config.inputChunkSize }) + .withNoVideo() + .inputFormat("m4a") + .audioCodec("libmp3lame") + .audioBitrate(128) + .format("mp3") + .on("error", err => console.error(err)) + .on("end", function() { + //console.warn("Unexpected end") + consumed = true; /*this.unpipe(outputStream)*/ + }) //, { end: false } + .stream(outputStream, {end: false}); // Don't close stream to keep continous play +} +const stream = require("stream"); app.get("/stream/:name", async function(req, res) { res.set({ "Content-Type": "audio/mpeg3", "Content-Range": "bytes 0-", "Transfer-Encoding": "chunked" }); - res.set('Cache-Control', 'no-store') + res.set("Cache-Control", "no-store"); let name = req.params.name; console.log("Serving Stream " + name); if (!Object.keys(contentStreams).includes(name)) { - let rawStream = retrieveStream( - playlists[name][Math.floor(Math.random() * playlists[name].length)] + let outputStream = new MultiWritable({ highWaterMark: config.chunkSize }); + var pass = new stream.PassThrough(); + playContent(name, pass, outputStream); + // FFmpeg chain + pass.on("end", function() { + console.warn("END!"); + outputStream.onExhaust(); + }); + pass.pipe( + outputStream, + { end: false } ); - - var command = ffmpeg(); - let outputStream = new MultiWritable({highWaterMark: config.chunkSize}); - - var tp = ffmpeg(rawStream, { highWaterMark: config.inputChunkSize }) - .withNoVideo() - .inputFormat("m4a") - .audioCodec("libmp3lame") - .audioBitrate(128) - .format("mp3") - .on("error", err => console.error(err)) - .on("end", () => console.log("Finished!")) - .save(outputStream); // FFmpeg chain //rawStream.pipe(outputStream); contentStreams[name] = outputStream; } diff --git a/utils.js b/utils.js index 308c0c9..c6dccec 100644 --- a/utils.js +++ b/utils.js @@ -7,6 +7,17 @@ class MultiWritable extends Writable { this.sendbuffer = []; this.started = false; } + thinkItIsDone(){ + console.log("Blank empty buffer func called") + // Do nothing let user override + } + onExhaust(){ + console.log("Blank Exhaust Called") + // Do nothing let user override + } + get empty(){ + return this.sendbuffer.length == 0; + } sendChunks() { //console.log(this.sendbuffer); if (!this.sendbuffer) { @@ -21,7 +32,7 @@ class MultiWritable extends Writable { //console.log(data + " " + this.sendbuffer.length); if (data) { // Chunks in Queue!!! - console.log("We have chunks " + Object.keys(data)); + //console.log("We have chunks " + Object.keys(data)); let { chunk, encoding, callback } = data; for (var i = 0; i < total; i++) { this.consumers[i].write(chunk, encoding, function() { @@ -31,9 +42,11 @@ class MultiWritable extends Writable { } }); } + }else{ + this.thinkItIsDone(); } } - _write(chunk, encoding, callback) { + write(chunk, encoding, callback) { if (!this.started) { this.started = true; var scope = this; From b68cd1a33b6a02acf863d37691d4f7e96b678f7b Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 20:05:23 +0000 Subject: [PATCH 08/29] Multistream seems to work for now --- config.js | 3 ++- public/script.js | 8 +++++++ server.js | 55 +++++++++++++++++++++++++++++++++++++++------- views/index.html | 2 +- views/station.html | 13 +++++++---- 5 files changed, 67 insertions(+), 14 deletions(-) diff --git a/config.js b/config.js index 777511d..36534d2 100644 --- a/config.js +++ b/config.js @@ -6,4 +6,5 @@ module.exports = { "chunkSize": 1024, "inputChunkSize": 1024, "sendInterval": 50 //*8// 1024*3/12 = 256 -} \ No newline at end of file +} +// Configure names here \ No newline at end of file diff --git a/public/script.js b/public/script.js index 27bab3f..ff04c63 100644 --- a/public/script.js +++ b/public/script.js @@ -12,3 +12,11 @@ $(function() { let controller = document.getElementById("controller"); controller.addEventListener("click", controllerclick); }); +function play(dest, elem){ + let audioelem = document.getElementById("streamelem"); + audioelem.src = dest; + audioelem.play(); + let name = elem.parentElement.children[0].innerText; + $("#station-name-display").text(name); + console.log("Station Name is "+name); +} \ No newline at end of file diff --git a/server.js b/server.js index 3a56a0f..809b953 100644 --- a/server.js +++ b/server.js @@ -40,11 +40,27 @@ var template = Handlebars.compile(stationtemplate); app.use(express.static("public")); // Testing streams let playlists = { - test: [ // "https://www.youtube.com/watch?v=B9AUUhg0Cdw", - "https://www.youtube.com/watch?v=rUWxSEwctFU" + test: [ + // "https://www.youtube.com/watch?v=B9AUUhg0Cdw", + "https://www.youtube.com/watch?v=rUWxSEwctFU", + "https://www.youtube.com/watch?v=vzYYW8V3Ibc" + ], + Chill:[ + "https://www.youtube.com/watch?v=jqkPqfOFmbY", + "https://www.youtube.com/watch?v=p-LOXXGGeAc", + "https://www.youtube.com/watch?v=Gc3tqnhmf5U" ] }; let contentStreams = {}; +let listenerCounts = {}; +function isAnyoneListening(name) { + if (Object.keys(listenerCounts).includes(name)) { + if (listenerCounts[name] > 0) { + return true; + } + } + return false; +} let streams = Object.keys(playlists); console.log("Init Handlers"); app.get("/", (req, res) => { @@ -63,7 +79,7 @@ app.get("/", (req, res) => { var ffmpeg = require("fluent-ffmpeg"); const PassThrough = require("stream").PassThrough; function playContent(name, outputStream, realOutputStream) { - console.log("Playing playlist "+name); + console.log("Playing playlist " + name); let rawStream = retrieveStream( playlists[name][Math.floor(Math.random() * playlists[name].length)] ); @@ -72,6 +88,14 @@ function playContent(name, outputStream, realOutputStream) { console.log("It might be done"); if (consumed) { console.log("IT is!"); + if (!isAnyoneListening(name)) { + console.log("Nobody is listening :( goodbye"); + console.log(realOutputStream); + realOutputStream.end(); + delete contentStreams[name]; + //outputStream.close(); + return; + } playContent(name, outputStream, realOutputStream); } }; @@ -79,10 +103,16 @@ function playContent(name, outputStream, realOutputStream) { realOutputStream.onExhaust = function() { consumed = true; //console.log("Count "+realOutputStream.sendBuffer.length) - console.log("Checking if buffer empty "+realOutputStream.empty); + console.log("Checking if buffer empty " + realOutputStream.empty); if (realOutputStream.empty) { - console.log("Recursive Play") - + console.log("Recursive Play"); + if (!isAnyoneListening(name)) { + console.log("Nobody is listening :( goodbye"); + //outputStream.close(); + realOutputStream.end(); + delete contentStreams[name]; + return; + } playContent(name, outputStream, realOutputStream); } }; @@ -98,7 +128,7 @@ function playContent(name, outputStream, realOutputStream) { //console.warn("Unexpected end") consumed = true; /*this.unpipe(outputStream)*/ }) //, { end: false } - .stream(outputStream, {end: false}); // Don't close stream to keep continous play + .stream(outputStream, { end: false }); // Don't close stream to keep continous play } const stream = require("stream"); app.get("/stream/:name", async function(req, res) { @@ -107,8 +137,12 @@ app.get("/stream/:name", async function(req, res) { "Content-Range": "bytes 0-", "Transfer-Encoding": "chunked" }); - res.set("Cache-Control", "no-store"); + res.set("Cache-Control", "no-store"); // WHY WOULD YOU WANNA CACHE A LIVESTREAM let name = req.params.name; + if (!Object.keys(listenerCounts).includes(name)) { + listenerCounts[name] = 0; + } + listenerCounts[name]++; console.log("Serving Stream " + name); if (!Object.keys(contentStreams).includes(name)) { let outputStream = new MultiWritable({ highWaterMark: config.chunkSize }); @@ -131,6 +165,10 @@ app.get("/stream/:name", async function(req, res) { contentStreams[name].consumers = contentStreams[name].consumers.filter( x => x != res ); + listenerCounts[name]--; + if (listenerCounts[name] <= 0) { + delete listenerCounts[name]; + } }); //res.send(req.params.name); }); @@ -138,3 +176,4 @@ app.get("/stream/:name", async function(req, res) { const listener = http.listen(process.env.PORT, () => { console.log("Your app is listening on port " + listener.address().port); }); +//setInterval(function(){console.log(listenerCounts)},2500); \ No newline at end of file diff --git a/views/index.html b/views/index.html index 00ba7cd..7a71af6 100644 --- a/views/index.html +++ b/views/index.html @@ -9,7 +9,7 @@

-

+
No station

diff --git a/views/station.html b/views/station.html index b6574b7..70e20c5 100644 --- a/views/station.html +++ b/views/station.html @@ -1,6 +1,11 @@ -
- {{name}} -
- +
+
+ {{name}} +
+ +
From 8f8264c6f3ccdb64563bdc1e941bd8a470c7ef41 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 20:16:24 +0000 Subject: [PATCH 09/29] Indicators added --- public/script.js | 4 +++- server.js | 4 ++-- views/index.html | 2 +- views/station.html | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/public/script.js b/public/script.js index ff04c63..6de15cd 100644 --- a/public/script.js +++ b/public/script.js @@ -16,7 +16,9 @@ function play(dest, elem){ let audioelem = document.getElementById("streamelem"); audioelem.src = dest; audioelem.play(); - let name = elem.parentElement.children[0].innerText; + //console.log(elem); + //console.log(elem.parentElement.children[0]); + let name = elem.parentElement.innerText; $("#station-name-display").text(name); console.log("Station Name is "+name); } \ No newline at end of file diff --git a/server.js b/server.js index 809b953..9cbf014 100644 --- a/server.js +++ b/server.js @@ -45,7 +45,7 @@ let playlists = { "https://www.youtube.com/watch?v=rUWxSEwctFU", "https://www.youtube.com/watch?v=vzYYW8V3Ibc" ], - Chill:[ + Chill: [ "https://www.youtube.com/watch?v=jqkPqfOFmbY", "https://www.youtube.com/watch?v=p-LOXXGGeAc", "https://www.youtube.com/watch?v=Gc3tqnhmf5U" @@ -176,4 +176,4 @@ app.get("/stream/:name", async function(req, res) { const listener = http.listen(process.env.PORT, () => { console.log("Your app is listening on port " + listener.address().port); }); -//setInterval(function(){console.log(listenerCounts)},2500); \ No newline at end of file +//setInterval(function(){console.log(listenerCounts)},2500); diff --git a/views/index.html b/views/index.html index 7a71af6..d4e68b2 100644 --- a/views/index.html +++ b/views/index.html @@ -4,7 +4,7 @@

- No song playing + Song Indicator Comi

diff --git a/views/station.html b/views/station.html index 70e20c5..a825509 100644 --- a/views/station.html +++ b/views/station.html @@ -1,10 +1,9 @@
{{name}} -
+
From f264e2b22ed7f1580ec890d13edfe7f90b0ce433 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 20:36:22 +0000 Subject: [PATCH 10/29] Backup before I move to ratelimited stream-throttle --- views/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.html b/views/index.html index d4e68b2..d45430b 100644 --- a/views/index.html +++ b/views/index.html @@ -4,7 +4,7 @@

- Song Indicator Comi + Song Indicator Coming Soon

From 2c1ad624f0d2907ca9a8b73ae121b0b15bca4df5 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 21:00:08 +0000 Subject: [PATCH 11/29] Rate limited stable! --- config.js | 2 +- package.json | 3 ++- server.js | 12 ++++++------ shrinkwrap.yaml | 17 ++++++++++++++++- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/config.js b/config.js index 36534d2..533a013 100644 --- a/config.js +++ b/config.js @@ -5,6 +5,6 @@ module.exports = { }, "chunkSize": 1024, "inputChunkSize": 1024, - "sendInterval": 50 //*8// 1024*3/12 = 256 + "bitrate": 16384 // Bitrate for sending chunks Formula: 1024*bitrate/8 = 128*bitrate in this case the bitrate is 128 } // Configure names here \ No newline at end of file diff --git a/package.json b/package.json index 3faaeef..95d5c8a 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "body-parser": "^1.19.0", "connect-sqlite3": "^0.9.11", "ytdl-core": "^2.1.4", - "fluent-ffmpeg": "^2.1.2" + "fluent-ffmpeg": "^2.1.2", + "stream-throttle": "^0.1.3" }, "engines": { "node": "10.x" diff --git a/server.js b/server.js index 9cbf014..acc7d41 100644 --- a/server.js +++ b/server.js @@ -116,7 +116,7 @@ function playContent(name, outputStream, realOutputStream) { playContent(name, outputStream, realOutputStream); } }; - console.log(outputStream); + //console.log(outputStream); let processer = ffmpeg(rawStream, { highWaterMark: config.inputChunkSize }) .withNoVideo() .inputFormat("m4a") @@ -131,6 +131,8 @@ function playContent(name, outputStream, realOutputStream) { .stream(outputStream, { end: false }); // Don't close stream to keep continous play } const stream = require("stream"); +const {ThrottleGroup, Throttle} = require("stream-throttle"); +var tg = new ThrottleGroup({rate: config.bitrate}); app.get("/stream/:name", async function(req, res) { res.set({ "Content-Type": "audio/mpeg3", @@ -145,7 +147,7 @@ app.get("/stream/:name", async function(req, res) { listenerCounts[name]++; console.log("Serving Stream " + name); if (!Object.keys(contentStreams).includes(name)) { - let outputStream = new MultiWritable({ highWaterMark: config.chunkSize }); + let outputStream = tg.throttle(); var pass = new stream.PassThrough(); playContent(name, pass, outputStream); // FFmpeg chain @@ -160,11 +162,9 @@ app.get("/stream/:name", async function(req, res) { //rawStream.pipe(outputStream); contentStreams[name] = outputStream; } - contentStreams[name].consumers.push(res); + contentStreams[name].pipe(res); req.on("close", function() { - contentStreams[name].consumers = contentStreams[name].consumers.filter( - x => x != res - ); + contentStreams[name].unpipe(res); listenerCounts[name]--; if (listenerCounts[name] <= 0) { delete listenerCounts[name]; diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 2c0dc6c..f68a673 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -9,6 +9,7 @@ dependencies: handlebars: 4.7.6 socket.io: 2.3.0 socket.io-express-session: 0.1.3 + stream-throttle: 0.1.3 ytdl-core: 2.1.4 packages: /abbrev/1.1.1: @@ -202,7 +203,6 @@ packages: integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== /commander/2.20.3: dev: false - optional: true resolution: integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== /component-bind/1.0.0: @@ -796,6 +796,10 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + /limiter/1.1.5: + dev: false + resolution: + integrity: sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA== /lodash/4.17.15: dev: false resolution: @@ -1369,6 +1373,16 @@ packages: node: '>= 0.6' resolution: integrity: sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + /stream-throttle/0.1.3: + dependencies: + commander: 2.20.3 + limiter: 1.1.5 + dev: false + engines: + node: '>= 0.10.0' + hasBin: true + resolution: + integrity: sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM= /string-width/1.0.2: dependencies: code-point-at: 1.1.0 @@ -1604,4 +1618,5 @@ specifiers: handlebars: ^4.7.6 socket.io: ^2.3.0 socket.io-express-session: ^0.1.3 + stream-throttle: ^0.1.3 ytdl-core: ^2.1.4 From ebb19dd48c2feab7c2c98e9838807beb5bfd7d28 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 22:01:47 +0000 Subject: [PATCH 12/29] New Stable Version working --- config.js | 6 ++++ server.js | 87 +++++++++++++++++++++++++++---------------------------- 2 files changed, 49 insertions(+), 44 deletions(-) diff --git a/config.js b/config.js index 533a013..3872abc 100644 --- a/config.js +++ b/config.js @@ -5,6 +5,12 @@ module.exports = { }, "chunkSize": 1024, "inputChunkSize": 1024, + "mode": "ordered", + /* + Ordered: Songs play in order of playlist and loop back after you're done + Shuffle: random songs are chosen doesn't prevent two songs from playing in a row + MAKE SURE IT'S lowercase + */ "bitrate": 16384 // Bitrate for sending chunks Formula: 1024*bitrate/8 = 128*bitrate in this case the bitrate is 128 } // Configure names here \ No newline at end of file diff --git a/server.js b/server.js index acc7d41..4091b49 100644 --- a/server.js +++ b/server.js @@ -62,6 +62,7 @@ function isAnyoneListening(name) { return false; } let streams = Object.keys(playlists); +let streamsPos = {}; console.log("Init Handlers"); app.get("/", (req, res) => { let output = ""; @@ -78,44 +79,21 @@ app.get("/", (req, res) => { }); var ffmpeg = require("fluent-ffmpeg"); const PassThrough = require("stream").PassThrough; -function playContent(name, outputStream, realOutputStream) { +function playContent(name, outputStream, realOutputStream, finish) { console.log("Playing playlist " + name); - let rawStream = retrieveStream( - playlists[name][Math.floor(Math.random() * playlists[name].length)] - ); + let pos = Math.floor(Math.random() * playlists[name].length); + if ((config.mode = "ordered" && !Object.keys(streamsPos).includes(name))) { + streamsPos[name] = pos; + } else { + streamsPos[name] += 1; + pos = streamsPos[name] % playlists[name].length; + } + let rawStream = retrieveStream(playlists[name][pos]); + rawStream.on("end", function() { + //rawStream.unpipe(processer); + }); let consumed = false; - realOutputStream.thinkItIsDone = function() { - console.log("It might be done"); - if (consumed) { - console.log("IT is!"); - if (!isAnyoneListening(name)) { - console.log("Nobody is listening :( goodbye"); - console.log(realOutputStream); - realOutputStream.end(); - delete contentStreams[name]; - //outputStream.close(); - return; - } - playContent(name, outputStream, realOutputStream); - } - }; - //console.log(realOutputStream.writable); - realOutputStream.onExhaust = function() { - consumed = true; - //console.log("Count "+realOutputStream.sendBuffer.length) - console.log("Checking if buffer empty " + realOutputStream.empty); - if (realOutputStream.empty) { - console.log("Recursive Play"); - if (!isAnyoneListening(name)) { - console.log("Nobody is listening :( goodbye"); - //outputStream.close(); - realOutputStream.end(); - delete contentStreams[name]; - return; - } - playContent(name, outputStream, realOutputStream); - } - }; + //console.log(outputStream); let processer = ffmpeg(rawStream, { highWaterMark: config.inputChunkSize }) .withNoVideo() @@ -127,12 +105,15 @@ function playContent(name, outputStream, realOutputStream) { .on("end", function() { //console.warn("Unexpected end") consumed = true; /*this.unpipe(outputStream)*/ + playContent(name, outputStream, outputStream); }) //, { end: false } + + /// , { end: false } .stream(outputStream, { end: false }); // Don't close stream to keep continous play } const stream = require("stream"); -const {ThrottleGroup, Throttle} = require("stream-throttle"); -var tg = new ThrottleGroup({rate: config.bitrate}); +const { ThrottleGroup, Throttle } = require("stream-throttle"); +var tg = new ThrottleGroup({ rate: config.bitrate }); app.get("/stream/:name", async function(req, res) { res.set({ "Content-Type": "audio/mpeg3", @@ -148,21 +129,39 @@ app.get("/stream/:name", async function(req, res) { console.log("Serving Stream " + name); if (!Object.keys(contentStreams).includes(name)) { let outputStream = tg.throttle(); - var pass = new stream.PassThrough(); - playContent(name, pass, outputStream); + //var pass = new stream.PassThrough(); + playContent(name, outputStream, outputStream, function() { + playContent(name, outputStream, outputStream); + }); // FFmpeg chain + /* pass.on("end", function() { console.warn("END!"); - outputStream.onExhaust(); + // outputStream.onExhaust(); }); pass.pipe( outputStream, - { end: false } + // { end: false } ); + */ //rawStream.pipe(outputStream); - contentStreams[name] = outputStream; + var pass = new stream.PassThrough({ end: false }); + outputStream.pipe( + pass, + { end: false } + ); + contentStreams[name] = pass; + pass.on("end", function() { + //console.warn("PASS ENDED"); + }); + outputStream.on("end", function() { + console.log("End of rate-limited stream"); + }); } - contentStreams[name].pipe(res); + contentStreams[name].pipe( + res, + { end: false } + ); req.on("close", function() { contentStreams[name].unpipe(res); listenerCounts[name]--; From 34229083307cb26c76cc225e9912e960d3d30835 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 22 May 2020 22:18:28 +0000 Subject: [PATCH 13/29] Endb integeration base --- .gitignore | 6 ++ config.js | 3 +- package.json | 5 +- server.js | 26 +++--- shrinkwrap.yaml | 234 ++++++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 251 insertions(+), 23 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1eb22ca --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.sqlite +.sqlite3 +.db +*.sqlite3 +*.sqlite +*.db \ No newline at end of file diff --git a/config.js b/config.js index 3872abc..a587d0a 100644 --- a/config.js +++ b/config.js @@ -11,6 +11,7 @@ module.exports = { Shuffle: random songs are chosen doesn't prevent two songs from playing in a row MAKE SURE IT'S lowercase */ - "bitrate": 16384 // Bitrate for sending chunks Formula: 1024*bitrate/8 = 128*bitrate in this case the bitrate is 128 + "bitrate": 16384, // Bitrate for sending chunks Formula: 1024*bitrate/8 = 128*bitrate in this case the bitrate is 128 + "databasefilename": "sqlite://playlists.db" } // Configure names here \ No newline at end of file diff --git a/package.json b/package.json index 95d5c8a..8c042c1 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,10 @@ "connect-sqlite3": "^0.9.11", "ytdl-core": "^2.1.4", "fluent-ffmpeg": "^2.1.2", - "stream-throttle": "^0.1.3" + "stream-throttle": "^0.1.3", + "sql": "^0.78.0", + "sqlite3": "^4.2.0", + "better-sqlite3": "^7.0.1" }, "engines": { "node": "10.x" diff --git a/server.js b/server.js index 4091b49..dc315a4 100644 --- a/server.js +++ b/server.js @@ -6,6 +6,7 @@ const { MultiWritable } = require("./utils"); var session = require("express-session"); const exphbs = require("express-handlebars"); const config = require("./config"); +const Endb = require("endb"); var { retrieveStream } = require("./contentHandler"); app.engine(".html", exphbs({ extname: ".html" })); app.set("view engine", ".html"); @@ -39,18 +40,7 @@ const Handlebars = require("handlebars"); var template = Handlebars.compile(stationtemplate); app.use(express.static("public")); // Testing streams -let playlists = { - test: [ - // "https://www.youtube.com/watch?v=B9AUUhg0Cdw", - "https://www.youtube.com/watch?v=rUWxSEwctFU", - "https://www.youtube.com/watch?v=vzYYW8V3Ibc" - ], - Chill: [ - "https://www.youtube.com/watch?v=jqkPqfOFmbY", - "https://www.youtube.com/watch?v=p-LOXXGGeAc", - "https://www.youtube.com/watch?v=Gc3tqnhmf5U" - ] -}; +let playlists = new Endb(config.databasefilename); let contentStreams = {}; let listenerCounts = {}; function isAnyoneListening(name) { @@ -79,16 +69,17 @@ app.get("/", (req, res) => { }); var ffmpeg = require("fluent-ffmpeg"); const PassThrough = require("stream").PassThrough; -function playContent(name, outputStream, realOutputStream, finish) { +async function playContent(name, outputStream, realOutputStream, finish) { console.log("Playing playlist " + name); - let pos = Math.floor(Math.random() * playlists[name].length); + let playlist = await playlists.get(name); + let pos = Math.floor(Math.random() * playlist.length); if ((config.mode = "ordered" && !Object.keys(streamsPos).includes(name))) { streamsPos[name] = pos; } else { streamsPos[name] += 1; pos = streamsPos[name] % playlists[name].length; } - let rawStream = retrieveStream(playlists[name][pos]); + let rawStream = retrieveStream(playlist[pos]); rawStream.on("end", function() { //rawStream.unpipe(processer); }); @@ -115,6 +106,10 @@ const stream = require("stream"); const { ThrottleGroup, Throttle } = require("stream-throttle"); var tg = new ThrottleGroup({ rate: config.bitrate }); app.get("/stream/:name", async function(req, res) { + if(!(await playlists.has(req.params.name))){ + res.status(404); + res.send("There isn't a playlist with that name"); + } res.set({ "Content-Type": "audio/mpeg3", "Content-Range": "bytes 0-", @@ -122,6 +117,7 @@ app.get("/stream/:name", async function(req, res) { }); res.set("Cache-Control", "no-store"); // WHY WOULD YOU WANNA CACHE A LIVESTREAM let name = req.params.name; + if (!Object.keys(listenerCounts).includes(name)) { listenerCounts[name] = 0; } diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index f68a673..3f362fd 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,4 +1,5 @@ dependencies: + better-sqlite3: 7.0.1 body-parser: 1.19.0 connect-sqlite3: 0.9.11 endb: 0.22.9 @@ -9,6 +10,8 @@ dependencies: handlebars: 4.7.6 socket.io: 2.3.0 socket.io-express-session: 0.1.3 + sql: 0.78.0 + sqlite3: 4.2.0 stream-throttle: 0.1.3 ytdl-core: 2.1.4 packages: @@ -119,6 +122,10 @@ packages: node: '>= 0.6.0' resolution: integrity: sha1-c5JncZI7Whl0etZmqlzUv5xunOg= + /base64-js/1.3.1: + dev: false + resolution: + integrity: sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== /base64id/2.0.0: dev: false engines: @@ -137,6 +144,29 @@ packages: dev: false resolution: integrity: sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI= + /better-sqlite3/7.0.1: + dependencies: + bindings: 1.5.0 + prebuild-install: 5.3.4 + tar: 4.4.10 + dev: false + requiresBuild: true + resolution: + integrity: sha512-fsVcoGXxnseNajbfFbth0BKnDWebPY6x77UWfrBHApCKq1yo41DlWnFsffOsLpjkQ4VKgDU5C3aUtiw3wGGU0Q== + /bindings/1.5.0: + dependencies: + file-uri-to-path: 1.0.0 + dev: false + resolution: + integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + /bl/4.0.2: + dependencies: + buffer: 5.6.0 + inherits: 2.0.4 + readable-stream: 3.6.0 + dev: false + resolution: + integrity: sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ== /blob/0.0.5: dev: false resolution: @@ -169,6 +199,13 @@ packages: dev: false resolution: integrity: sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== + /buffer/5.6.0: + dependencies: + base64-js: 1.3.1 + ieee754: 1.1.13 + dev: false + resolution: + integrity: sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw== /bytes/3.1.0: dev: false engines: @@ -299,6 +336,14 @@ packages: dev: false resolution: integrity: sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + /decompress-response/4.2.1: + dependencies: + mimic-response: 2.1.0 + dev: false + engines: + node: '>=8' + resolution: + integrity: sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== /deep-extend/0.6.0: dev: false engines: @@ -363,6 +408,12 @@ packages: node: '>= 0.8' resolution: integrity: sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + /end-of-stream/1.4.4: + dependencies: + once: 1.4.0 + dev: false + resolution: + integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== /endb/0.22.9: dependencies: buffer-json: 2.0.0 @@ -419,6 +470,12 @@ packages: node: '>= 0.6' resolution: integrity: sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + /expand-template/2.0.3: + dev: false + engines: + node: '>=6' + resolution: + integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== /express-handlebars/4.0.3: dependencies: glob: 7.1.6 @@ -507,6 +564,10 @@ packages: dev: false resolution: integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + /file-uri-to-path/1.0.0: + dev: false + resolution: + integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== /finalhandler/1.1.2: dependencies: debug: 2.6.9 @@ -556,6 +617,10 @@ packages: node: '>= 0.6' resolution: integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + /fs-constants/1.0.0: + dev: false + resolution: + integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== /fs-minipass/1.2.7: dependencies: minipass: 2.9.0 @@ -589,6 +654,10 @@ packages: dev: false resolution: integrity: sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + /github-from-package/0.0.0: + dev: false + resolution: + integrity: sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= /glob/7.1.6: dependencies: fs.realpath: 1.0.0 @@ -700,6 +769,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + /ieee754/1.1.13: + dev: false + resolution: + integrity: sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== /ignore-walk/3.0.3: dependencies: minimatch: 3.0.4 @@ -800,6 +873,10 @@ packages: dev: false resolution: integrity: sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA== + /lodash/4.1.0: + dev: false + resolution: + integrity: sha1-KZiUKD3gGp7vvt/0xLmwCmoubpY= /lodash/4.17.15: dev: false resolution: @@ -864,6 +941,12 @@ packages: hasBin: true resolution: integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + /mimic-response/2.1.0: + dev: false + engines: + node: '>=8' + resolution: + integrity: sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== /miniget/1.7.0: dev: false engines: @@ -882,7 +965,7 @@ packages: integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== /minipass/2.9.0: dependencies: - safe-buffer: 5.2.0 + safe-buffer: 5.2.1 yallist: 3.1.1 dev: false resolution: @@ -893,6 +976,10 @@ packages: dev: false resolution: integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + /mkdirp-classic/0.5.3: + dev: false + resolution: + integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== /mkdirp/0.5.5: dependencies: minimist: 1.2.5 @@ -916,7 +1003,11 @@ packages: dev: false resolution: integrity: sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== - /needle/2.4.1: + /napi-build-utils/1.0.2: + dev: false + resolution: + integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + /needle/2.5.0: dependencies: debug: 3.2.6 iconv-lite: 0.4.24 @@ -926,7 +1017,7 @@ packages: node: '>= 4.4.x' hasBin: true resolution: - integrity: sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g== + integrity: sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA== /negotiator/0.6.2: dev: false engines: @@ -937,11 +1028,17 @@ packages: dev: false resolution: integrity: sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + /node-abi/2.17.0: + dependencies: + semver: 5.7.1 + dev: false + resolution: + integrity: sha512-dFRAA0ACk/aBo0TIXQMEWMLUTyWYYT8OBYIzLmEUrQTElGRjxDCvyBZIsDL0QA7QCaj9PrawhOmTEdsuLY4uOQ== /node-pre-gyp/0.11.0: dependencies: detect-libc: 1.0.3 mkdirp: 0.5.5 - needle: 2.4.1 + needle: 2.5.0 nopt: 4.0.3 npm-packlist: 1.4.8 npmlog: 4.1.2 @@ -953,6 +1050,10 @@ packages: hasBin: true resolution: integrity: sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== + /noop-logger/0.1.1: + dev: false + resolution: + integrity: sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= /nopt/4.0.3: dependencies: abbrev: 1.1.1 @@ -1096,6 +1197,29 @@ packages: dev: false resolution: integrity: sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + /prebuild-install/5.3.4: + dependencies: + detect-libc: 1.0.3 + expand-template: 2.0.3 + github-from-package: 0.0.0 + minimist: 1.2.5 + mkdirp: 0.5.5 + napi-build-utils: 1.0.2 + node-abi: 2.17.0 + noop-logger: 0.1.1 + npmlog: 4.1.2 + pump: 3.0.0 + rc: 1.2.8 + simple-get: 3.1.0 + tar-fs: 2.1.0 + tunnel-agent: 0.6.0 + which-pm-runs: 1.0.0 + dev: false + engines: + node: '>=6' + hasBin: true + resolution: + integrity: sha512-AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA== /process-nextick-args/2.0.1: dev: false resolution: @@ -1119,6 +1243,13 @@ packages: dev: false resolution: integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + /pump/3.0.0: + dependencies: + end-of-stream: 1.4.4 + once: 1.4.0 + dev: false + resolution: + integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== /punycode/2.1.1: dev: false engines: @@ -1182,6 +1313,16 @@ packages: dev: false resolution: integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + /readable-stream/3.6.0: + dependencies: + inherits: 2.0.4 + string_decoder: 1.3.0 + util-deprecate: 1.0.2 + dev: false + engines: + node: '>= 6' + resolution: + integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== /request/2.88.2: dependencies: aws-sign2: 0.7.0 @@ -1225,6 +1366,10 @@ packages: dev: false resolution: integrity: sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + /safe-buffer/5.2.1: + dev: false + resolution: + integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== /safer-buffer/2.1.2: dev: false resolution: @@ -1281,6 +1426,22 @@ packages: dev: false resolution: integrity: sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + /simple-concat/1.0.0: + dev: false + resolution: + integrity: sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= + /simple-get/3.1.0: + dependencies: + decompress-response: 4.2.1 + once: 1.4.0 + simple-concat: 1.0.0 + dev: false + resolution: + integrity: sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== + /sliced/0.0.5: + dev: false + resolution: + integrity: sha1-XtwETKTrb3gW1Qui/GPiXY/kcH8= /socket.io-adapter/1.1.2: dev: false resolution: @@ -1341,6 +1502,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + /sql/0.78.0: + dependencies: + lodash: 4.1.0 + sliced: 0.0.5 + dev: false + resolution: + integrity: sha1-iUWF1WER27F2h0Gk2ZNcgshZWUk= /sqlite3/4.1.1: dependencies: nan: 2.14.1 @@ -1350,6 +1518,14 @@ packages: requiresBuild: true resolution: integrity: sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg== + /sqlite3/4.2.0: + dependencies: + nan: 2.14.1 + node-pre-gyp: 0.11.0 + dev: false + requiresBuild: true + resolution: + integrity: sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg== /sshpk/1.16.1: dependencies: asn1: 0.2.4 @@ -1408,6 +1584,12 @@ packages: dev: false resolution: integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + /string_decoder/1.3.0: + dependencies: + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== /strip-ansi/3.0.1: dependencies: ansi-regex: 2.1.1 @@ -1430,6 +1612,39 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= + /tar-fs/2.1.0: + dependencies: + chownr: 1.1.4 + mkdirp-classic: 0.5.3 + pump: 3.0.0 + tar-stream: 2.1.2 + dev: false + resolution: + integrity: sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg== + /tar-stream/2.1.2: + dependencies: + bl: 4.0.2 + end-of-stream: 1.4.4 + fs-constants: 1.0.0 + inherits: 2.0.4 + readable-stream: 3.6.0 + dev: false + resolution: + integrity: sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q== + /tar/4.4.10: + dependencies: + chownr: 1.1.4 + fs-minipass: 1.2.7 + minipass: 2.9.0 + minizlib: 1.3.3 + mkdirp: 0.5.5 + safe-buffer: 5.2.1 + yallist: 3.1.1 + dev: false + engines: + node: '>=4.5' + resolution: + integrity: sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA== /tar/4.4.13: dependencies: chownr: 1.1.4 @@ -1437,7 +1652,7 @@ packages: minipass: 2.9.0 minizlib: 1.3.3 mkdirp: 0.5.5 - safe-buffer: 5.2.0 + safe-buffer: 5.2.1 yallist: 3.1.1 dev: false engines: @@ -1465,7 +1680,7 @@ packages: integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== /tunnel-agent/0.6.0: dependencies: - safe-buffer: 5.2.0 + safe-buffer: 5.2.1 dev: false resolution: integrity: sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= @@ -1543,6 +1758,10 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + /which-pm-runs/1.0.0: + dev: false + resolution: + integrity: sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= /which/1.3.1: dependencies: isexe: 2.0.0 @@ -1608,6 +1827,7 @@ registry: 'https://registry.npmjs.org/' shrinkwrapMinorVersion: 9 shrinkwrapVersion: 3 specifiers: + better-sqlite3: ^7.0.1 body-parser: ^1.19.0 connect-sqlite3: ^0.9.11 endb: ^0.22.9 @@ -1618,5 +1838,7 @@ specifiers: handlebars: ^4.7.6 socket.io: ^2.3.0 socket.io-express-session: ^0.1.3 + sql: ^0.78.0 + sqlite3: ^4.2.0 stream-throttle: ^0.1.3 ytdl-core: ^2.1.4 From 3ffa91fb1e98ea822ee3c8464cd9b28c13cef642 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sat, 23 May 2020 01:21:01 +0000 Subject: [PATCH 14/29] Bug Squashing + ADMIN PANEL --- config.js | 3 +- server.js | 118 +++++++++++++++++++++++++++++++-- sessions | Bin 12288 -> 12288 bytes views/admin_playlist.html | 12 ++++ views/admin_playlist_item.html | 1 + views/adminpanel.html | 29 ++++++++ views/auth.html | 14 ++++ views/playlist_editor.html | 25 +++++++ views/playlists_admin.html | 15 +++++ 9 files changed, 210 insertions(+), 7 deletions(-) create mode 100644 views/admin_playlist.html create mode 100644 views/admin_playlist_item.html create mode 100644 views/adminpanel.html create mode 100644 views/auth.html create mode 100644 views/playlist_editor.html create mode 100644 views/playlists_admin.html diff --git a/config.js b/config.js index a587d0a..827feec 100644 --- a/config.js +++ b/config.js @@ -12,6 +12,7 @@ module.exports = { MAKE SURE IT'S lowercase */ "bitrate": 16384, // Bitrate for sending chunks Formula: 1024*bitrate/8 = 128*bitrate in this case the bitrate is 128 - "databasefilename": "sqlite://playlists.db" + "databasefilename": "sqlite://playlists.db", + "authurl":"/admin" } // Configure names here \ No newline at end of file diff --git a/server.js b/server.js index dc315a4..8b5bb60 100644 --- a/server.js +++ b/server.js @@ -35,9 +35,21 @@ var stationtemplate = fs.readFileSync( __dirname + "/views/station.html", "utf8" ); +var adminplaylisttemplate = fs.readFileSync( + __dirname + "/views/admin_playlist.html", + "utf8" +); +var adminplaylistitemtemplate = fs.readFileSync( + __dirname + "/views/admin_playlist_item.html", + "utf8" +); console.log(stationtemplate); const Handlebars = require("handlebars"); var template = Handlebars.compile(stationtemplate); +var admin_playlist_template = Handlebars.compile(adminplaylisttemplate); +var admin_playlist_item_template = Handlebars.compile( + adminplaylistitemtemplate +); app.use(express.static("public")); // Testing streams let playlists = new Endb(config.databasefilename); @@ -51,10 +63,103 @@ function isAnyoneListening(name) { } return false; } -let streams = Object.keys(playlists); + let streamsPos = {}; console.log("Init Handlers"); -app.get("/", (req, res) => { +app.get(config.authurl, function(req, res) { + if (req.session.logintime) { + res.render(__dirname + "/views/adminpanel.html", config.webexports); + } else { + res.render(__dirname + "/views/auth.html", config.webexports); + } +}); +app.get("/logout", function(req, res) { + req.session.destroy(); + res.redirect(config.authurl); +}); +app.post(config.authurl, function(req, res) { + if (req.body.password == process.env.PASSWORD) { + req.session.logintime = Date.now(); + res.render(__dirname + "/views/adminpanel.html", config.webexports); + } else { + res.send("Incorrect Password. Try again. "); + } +}); +app.get("/playlist_editor/:name", async function(req, res) { + let name = req.params.name; + if (req.session.logintime) { + if (await playlists.has(name)) { + let playlist = await playlists.get(name); + let output = ""; + for (var i = 0; i < playlist.length; i++) { + output = + output + + admin_playlist_item_template({ + name: playlist[i].name, + count: playlist[i].source + }); + } + res.render(__dirname + "/views/playlist_editor.html", { + ...config.webexports, + ...{ playlist_items: output, playlist_name: name } + }); + } else { + req.send("Not a playlist"); + } + } else { + req.send("Please log in"); + } +}); +app.post("/playlist_editor/:name", async function(req, res) { + if (req.session.logintime) { + let name = req.params.name; + if (!name) { + res.send("No playlist name specified"); + return; + } + if (await playlists.has(name)) { + let playlist = await playlists.get(name); + playlist.push({ name: req.body.item_name, source: req.body.item_source }); + await playlists.set(name, playlist); + res.redirect("/playlist_editor/" + name); + } else { + res.send("Playlist doesn't exist"); + } + } else { + res.send("Please log in"); + } +}); +app.get("/edit_playlists", async function(req, res) { + if (req.session.logintime) { + let output = ""; + let all_playlists = await playlists.all(); + for (var i = 0; i < all_playlists.length; i++) { + output = + output + + admin_playlist_template({ + name: all_playlists[i]["key"], + count: all_playlists[i]["value"].length + }); + } + res.render(__dirname + "/views/playlists_admin.html", { + ...config.webexports, + ...{ playlists: output } + }); + } else { + res.send("Please log in"); + } +}); +app.post("/edit_playlists", async function(req, res) { + if (req.session.logintime) { + playlists.set(req.body.playlist_name, []); + res.redirect("/edit_playlists"); + } else { + res.send("Please log in"); + } + res.redirect("/edit_playlists"); +}); +app.get("/", async (req, res) => { + let streams = await playlists.keys(); let output = ""; for (var i = 0; i < streams.length; i++) { output = @@ -77,9 +182,9 @@ async function playContent(name, outputStream, realOutputStream, finish) { streamsPos[name] = pos; } else { streamsPos[name] += 1; - pos = streamsPos[name] % playlists[name].length; + pos = streamsPos[name] % playlist.length; } - let rawStream = retrieveStream(playlist[pos]); + let rawStream = retrieveStream(playlist[pos]["source"]); rawStream.on("end", function() { //rawStream.unpipe(processer); }); @@ -106,9 +211,10 @@ const stream = require("stream"); const { ThrottleGroup, Throttle } = require("stream-throttle"); var tg = new ThrottleGroup({ rate: config.bitrate }); app.get("/stream/:name", async function(req, res) { - if(!(await playlists.has(req.params.name))){ + if (!(await playlists.has(req.params.name))) { res.status(404); res.send("There isn't a playlist with that name"); + return; } res.set({ "Content-Type": "audio/mpeg3", @@ -117,7 +223,7 @@ app.get("/stream/:name", async function(req, res) { }); res.set("Cache-Control", "no-store"); // WHY WOULD YOU WANNA CACHE A LIVESTREAM let name = req.params.name; - + if (!Object.keys(listenerCounts).includes(name)) { listenerCounts[name] = 0; } diff --git a/sessions b/sessions index 7294b5fc1e1731fa38e13d1fa48a509ca7308587..34254946621ef442e96f67de445f131d8f473f0c 100644 GIT binary patch delta 495 zcmZojXh@hK&A4i!j5Fh^jR{NmIhgq7GVuHJ&D~fyk*~f{uaT40m%WMK)4inJz|`Np z!aL8o*e@s8)FLz~+0-Jkpd{2K#Us$$sa(xyMSucBwNi3^es*T6l2x@*eoAD+)4;Qj3+Wl#C3F40H`lb&U-|3=FM|46KX|^i0gmqLg%$ zGD_-83jFhODwV8Cib_*;lnN3{GJsn2m1=dAa`J&@mt^Jw%{4T&G%&O@Gc`0YH8-to z)Jp`rII-N_+#s-|v^cXMAT>A7yu`>ox3ttR$h6$cAl<{&5aeRv#~<*zxE|AEf)g=0~7yN2L7%5w}DI~uvuPUHovzjvo8~& P@Mq{$VfJMt +
+
{{name}}
+
+ {{count}} items in this playlist +
+

+ Playlist descriptions are probaly gonna be part of a future update. +

+ Edit Playlist +
+
diff --git a/views/admin_playlist_item.html b/views/admin_playlist_item.html new file mode 100644 index 0000000..fbbdc77 --- /dev/null +++ b/views/admin_playlist_item.html @@ -0,0 +1 @@ +{{name}}: {{link}} \ No newline at end of file diff --git a/views/adminpanel.html b/views/adminpanel.html new file mode 100644 index 0000000..bab682a --- /dev/null +++ b/views/adminpanel.html @@ -0,0 +1,29 @@ +
+

+ Welcome to the Admin Panel! +

+

+ Here you can... +

+
+
+ + Edit playlists + + + Logout + +
+
+

+ These features are coming soon +

+ + +
+
+
\ No newline at end of file diff --git a/views/auth.html b/views/auth.html new file mode 100644 index 0000000..8d6b048 --- /dev/null +++ b/views/auth.html @@ -0,0 +1,14 @@ +
+

Welcome to {{display_brand}} administration

+
+ Please Login with the password: + + +
+

+ Using https to login is strongly recommended as there is + barely any security in http to prevent theft of the password. +

+
diff --git a/views/playlist_editor.html b/views/playlist_editor.html new file mode 100644 index 0000000..95c365e --- /dev/null +++ b/views/playlist_editor.html @@ -0,0 +1,25 @@ +
+

+ Editing playlist {{playlist_name}} +

+ back +
+ {{{playlist_items}}} +
+
+ Add new item to playlist. Duplicates are allowed! + + + +
+
diff --git a/views/playlists_admin.html b/views/playlists_admin.html new file mode 100644 index 0000000..9daa574 --- /dev/null +++ b/views/playlists_admin.html @@ -0,0 +1,15 @@ +
+

+ Showing playlists +

+
+ {{{playlists}}} +
+
+ Create new Playlist: + + +
+
From 62e91672c4b97ecc2054f928ff728c91563cda32 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sat, 23 May 2020 03:40:07 +0000 Subject: [PATCH 15/29] Butterchurn integeration 1 of 2 probaly get rid of browserify --- final.js | 87 ++ final.js.tmp-browserify-73042202549475820916 | 0 package.json | 9 +- public/final.js | 87 ++ public/script.js | 81 +- server.js | 19 + sessions | Bin 12288 -> 12288 bytes shrinkwrap.yaml | 849 +++++++++++++++++++ utils.js | 1 + views/index.html | 2 + views/layouts/main.html | 2 +- views/playlists_delete_confirm.html | 0 12 files changed, 1124 insertions(+), 13 deletions(-) create mode 100644 final.js create mode 100644 final.js.tmp-browserify-73042202549475820916 create mode 100644 public/final.js create mode 100644 views/playlists_delete_confirm.html diff --git a/final.js b/final.js new file mode 100644 index 0000000..0eb99ac --- /dev/null +++ b/final.js @@ -0,0 +1,87 @@ +(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i { let streams = await playlists.keys(); let output = ""; diff --git a/sessions b/sessions index 34254946621ef442e96f67de445f131d8f473f0c..0ebee46905a945b7a8c44d7a4dc310abd8783b32 100644 GIT binary patch delta 88 zcmZojXh@hK#l);MQN{^KZcMP3V`^iZyiiVq#VV&KVRD_ks)~hIRfl9iH? rfsui(fvK*sL5P8|m9d$Xp^2W6xy9t;@&=pT= 0.6' resolution: integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + /acorn-node/1.8.2: + dependencies: + acorn: 7.2.0 + acorn-walk: 7.1.1 + xtend: 4.0.2 + dev: false + resolution: + integrity: sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== + /acorn-walk/7.1.1: + dev: false + engines: + node: '>=0.4.0' + resolution: + integrity: sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== + /acorn/7.2.0: + dev: false + engines: + node: '>=0.4.0' + hasBin: true + resolution: + integrity: sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ== /after/0.8.2: dev: false resolution: @@ -76,6 +114,14 @@ packages: dev: false resolution: integrity: sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= + /asn1.js/4.10.1: + dependencies: + bn.js: 4.11.9 + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + dev: false + resolution: + integrity: sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw== /asn1/0.2.4: dependencies: safer-buffer: 2.1.2 @@ -88,6 +134,13 @@ packages: node: '>=0.8' resolution: integrity: sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + /assert/1.5.0: + dependencies: + object-assign: 4.1.1 + util: 0.10.3 + dev: false + resolution: + integrity: sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== /async-limiter/1.0.1: dev: false resolution: @@ -108,6 +161,13 @@ packages: dev: false resolution: integrity: sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== + /babel-runtime/6.26.0: + dependencies: + core-js: 2.6.11 + regenerator-runtime: 0.11.1 + dev: false + resolution: + integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= /backo2/1.0.2: dev: false resolution: @@ -171,6 +231,14 @@ packages: dev: false resolution: integrity: sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== + /bn.js/4.11.9: + dev: false + resolution: + integrity: sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== + /bn.js/5.1.2: + dev: false + resolution: + integrity: sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== /body-parser/1.19.0: dependencies: bytes: 3.1.0 @@ -195,10 +263,158 @@ packages: dev: false resolution: integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + /brorand/1.1.0: + dev: false + resolution: + integrity: sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + /browser-pack/6.1.0: + dependencies: + JSONStream: 1.3.5 + combine-source-map: 0.8.0 + defined: 1.0.0 + safe-buffer: 5.2.1 + through2: 2.0.5 + umd: 3.0.3 + dev: false + hasBin: true + resolution: + integrity: sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA== + /browser-resolve/1.11.3: + dependencies: + resolve: 1.1.7 + dev: false + resolution: + integrity: sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ== + /browserify-aes/1.2.0: + dependencies: + buffer-xor: 1.0.3 + cipher-base: 1.0.4 + create-hash: 1.2.0 + evp_bytestokey: 1.0.3 + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== + /browserify-cipher/1.0.1: + dependencies: + browserify-aes: 1.2.0 + browserify-des: 1.0.2 + evp_bytestokey: 1.0.3 + dev: false + resolution: + integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== + /browserify-des/1.0.2: + dependencies: + cipher-base: 1.0.4 + des.js: 1.0.1 + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== + /browserify-rsa/4.0.1: + dependencies: + bn.js: 4.11.9 + randombytes: 2.1.0 + dev: false + resolution: + integrity: sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ= + /browserify-sign/4.2.0: + dependencies: + bn.js: 5.1.2 + browserify-rsa: 4.0.1 + create-hash: 1.2.0 + create-hmac: 1.1.7 + elliptic: 6.5.2 + inherits: 2.0.4 + parse-asn1: 5.1.5 + readable-stream: 3.6.0 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA== + /browserify-zlib/0.2.0: + dependencies: + pako: 1.0.11 + dev: false + resolution: + integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== + /browserify/16.5.1: + dependencies: + JSONStream: 1.3.5 + assert: 1.5.0 + browser-pack: 6.1.0 + browser-resolve: 1.11.3 + browserify-zlib: 0.2.0 + buffer: 5.2.1 + cached-path-relative: 1.0.2 + concat-stream: 1.6.2 + console-browserify: 1.2.0 + constants-browserify: 1.0.0 + crypto-browserify: 3.12.0 + defined: 1.0.0 + deps-sort: 2.0.1 + domain-browser: 1.2.0 + duplexer2: 0.1.4 + events: 2.1.0 + glob: 7.1.6 + has: 1.0.3 + htmlescape: 1.1.1 + https-browserify: 1.0.0 + inherits: 2.0.4 + insert-module-globals: 7.2.0 + labeled-stream-splicer: 2.0.2 + mkdirp-classic: 0.5.3 + module-deps: 6.2.2 + os-browserify: 0.3.0 + parents: 1.0.1 + path-browserify: 0.0.1 + process: 0.11.10 + punycode: 1.4.1 + querystring-es3: 0.2.1 + read-only-stream: 2.0.0 + readable-stream: 2.3.7 + resolve: 1.17.0 + shasum: 1.0.2 + shell-quote: 1.7.2 + stream-browserify: 2.0.2 + stream-http: 3.1.1 + string_decoder: 1.3.0 + subarg: 1.0.0 + syntax-error: 1.4.0 + through2: 2.0.5 + timers-browserify: 1.4.2 + tty-browserify: 0.0.1 + url: 0.11.0 + util: 0.10.4 + vm-browserify: 1.1.2 + xtend: 4.0.2 + dev: false + engines: + node: '>= 0.8' + hasBin: true + resolution: + integrity: sha512-EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A== + /buffer-from/1.1.1: + dev: false + resolution: + integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== /buffer-json/2.0.0: dev: false resolution: integrity: sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== + /buffer-xor/1.0.3: + dev: false + resolution: + integrity: sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + /buffer/5.2.1: + dependencies: + base64-js: 1.3.1 + ieee754: 1.1.13 + dev: false + resolution: + integrity: sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg== /buffer/5.6.0: dependencies: base64-js: 1.3.1 @@ -206,12 +422,35 @@ packages: dev: false resolution: integrity: sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw== + /builtin-status-codes/3.0.0: + dev: false + resolution: + integrity: sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + /butterchurn-presets/2.4.7: + dependencies: + babel-runtime: 6.26.0 + ecma-proposal-math-extensions: 0.0.2 + lodash: 4.17.15 + dev: false + resolution: + integrity: sha512-4MdM8ripz/VfH1BCldrIKdAc/1ryJFBDvqlyow6Ivo1frwj0H3duzvSMFC7/wIjAjxb1QpwVHVqGqS9uAFKhpg== + /butterchurn/2.6.7: + dependencies: + '@babel/runtime': 7.9.6 + ecma-proposal-math-extensions: 0.0.2 + dev: false + resolution: + integrity: sha512-BJiRA8L0L2+84uoG2SSfkp0kclBuN+vQKf217pK7pMlwEO2ZEg3MtO2/o+l8Qpr8Nbejg8tmL1ZHD1jmhiaaqg== /bytes/3.1.0: dev: false engines: node: '>= 0.8' resolution: integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + /cached-path-relative/1.0.2: + dev: false + resolution: + integrity: sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg== /callsite/1.0.0: dev: false resolution: @@ -224,12 +463,28 @@ packages: dev: false resolution: integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + /cipher-base/1.0.4: + dependencies: + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== /code-point-at/1.1.0: dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + /combine-source-map/0.8.0: + dependencies: + convert-source-map: 1.1.3 + inline-source-map: 0.6.2 + lodash.memoize: 3.0.4 + source-map: 0.5.7 + dev: false + resolution: + integrity: sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos= /combined-stream/1.0.8: dependencies: delayed-stream: 1.0.0 @@ -258,6 +513,17 @@ packages: dev: false resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + /concat-stream/1.6.2: + dependencies: + buffer-from: 1.1.1 + inherits: 2.0.4 + readable-stream: 2.3.7 + typedarray: 0.0.6 + dev: false + engines: + '0': node >= 0.8 + resolution: + integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== /connect-sqlite3/0.9.11: dependencies: sqlite3: 4.1.1 @@ -266,10 +532,18 @@ packages: node: '>=0.4.x' resolution: integrity: sha1-TlQVXcLq3ypZmDhbLzXoPdkkCy0= + /console-browserify/1.2.0: + dev: false + resolution: + integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== /console-control-strings/1.1.0: dev: false resolution: integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + /constants-browserify/1.0.0: + dev: false + resolution: + integrity: sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= /content-disposition/0.5.3: dependencies: safe-buffer: 5.1.2 @@ -284,6 +558,10 @@ packages: node: '>= 0.6' resolution: integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + /convert-source-map/1.1.3: + dev: false + resolution: + integrity: sha1-SCnId+n+SbMWHzvzZziI4gRpmGA= /cookie-signature/1.0.6: dev: false resolution: @@ -300,10 +578,64 @@ packages: node: '>= 0.6' resolution: integrity: sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + /core-js/2.6.11: + deprecated: 'core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.' + dev: false + requiresBuild: true + resolution: + integrity: sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== /core-util-is/1.0.2: dev: false resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + /create-ecdh/4.0.3: + dependencies: + bn.js: 4.11.9 + elliptic: 6.5.2 + dev: false + resolution: + integrity: sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw== + /create-hash/1.2.0: + dependencies: + cipher-base: 1.0.4 + inherits: 2.0.4 + md5.js: 1.3.5 + ripemd160: 2.0.2 + sha.js: 2.4.11 + dev: false + resolution: + integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== + /create-hmac/1.1.7: + dependencies: + cipher-base: 1.0.4 + create-hash: 1.2.0 + inherits: 2.0.4 + ripemd160: 2.0.2 + safe-buffer: 5.2.1 + sha.js: 2.4.11 + dev: false + resolution: + integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== + /crypto-browserify/3.12.0: + dependencies: + browserify-cipher: 1.0.1 + browserify-sign: 4.2.0 + create-ecdh: 4.0.3 + create-hash: 1.2.0 + create-hmac: 1.1.7 + diffie-hellman: 5.0.3 + inherits: 2.0.4 + pbkdf2: 3.0.17 + public-encrypt: 4.0.3 + randombytes: 2.1.0 + randomfill: 1.0.4 + dev: false + resolution: + integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== + /dash-ast/1.0.0: + dev: false + resolution: + integrity: sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA== /dashdash/1.14.1: dependencies: assert-plus: 1.0.0 @@ -358,6 +690,10 @@ packages: node: '>= 0.4' resolution: integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + /defined/1.0.0: + dev: false + resolution: + integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= /delayed-stream/1.0.0: dev: false engines: @@ -380,6 +716,23 @@ packages: node: '>= 0.8' resolution: integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + /deps-sort/2.0.1: + dependencies: + JSONStream: 1.3.5 + shasum-object: 1.0.0 + subarg: 1.0.0 + through2: 2.0.5 + dev: false + hasBin: true + resolution: + integrity: sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw== + /des.js/1.0.1: + dependencies: + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + dev: false + resolution: + integrity: sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== /destroy/1.0.4: dev: false resolution: @@ -391,6 +744,38 @@ packages: hasBin: true resolution: integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + /detective/5.2.0: + dependencies: + acorn-node: 1.8.2 + defined: 1.0.0 + minimist: 1.2.5 + dev: false + engines: + node: '>=0.8.0' + hasBin: true + resolution: + integrity: sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== + /diffie-hellman/5.0.3: + dependencies: + bn.js: 4.11.9 + miller-rabin: 4.0.1 + randombytes: 2.1.0 + dev: false + resolution: + integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== + /domain-browser/1.2.0: + dev: false + engines: + node: '>=0.4' + npm: '>=1.2' + resolution: + integrity: sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== + /duplexer2/0.1.4: + dependencies: + readable-stream: 2.3.7 + dev: false + resolution: + integrity: sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= /ecc-jsbn/0.1.2: dependencies: jsbn: 0.1.1 @@ -398,10 +783,26 @@ packages: dev: false resolution: integrity: sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + /ecma-proposal-math-extensions/0.0.2: + dev: false + resolution: + integrity: sha1-pqPWSBnbcM7g0uGXa2MV0A5HFKA= /ee-first/1.1.1: dev: false resolution: integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + /elliptic/6.5.2: + dependencies: + bn.js: 4.11.9 + brorand: 1.1.0 + hash.js: 1.1.7 + hmac-drbg: 1.0.1 + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + minimalistic-crypto-utils: 1.0.1 + dev: false + resolution: + integrity: sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== /encodeurl/1.0.2: dev: false engines: @@ -470,6 +871,19 @@ packages: node: '>= 0.6' resolution: integrity: sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + /events/2.1.0: + dev: false + engines: + node: '>=0.4.x' + resolution: + integrity: sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg== + /evp_bytestokey/1.0.3: + dependencies: + md5.js: 1.3.5 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== /expand-template/2.0.3: dev: false engines: @@ -564,6 +978,10 @@ packages: dev: false resolution: integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + /fast-safe-stringify/2.0.7: + dev: false + resolution: + integrity: sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== /file-uri-to-path/1.0.0: dev: false resolution: @@ -648,6 +1066,10 @@ packages: dev: false resolution: integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + /get-assigned-identifiers/1.2.0: + dev: false + resolution: + integrity: sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ== /getpass/0.1.7: dependencies: assert-plus: 1.0.0 @@ -722,10 +1144,49 @@ packages: dev: false resolution: integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + /has/1.0.3: + dependencies: + function-bind: 1.1.1 + dev: false + engines: + node: '>= 0.4.0' + resolution: + integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + /hash-base/3.1.0: + dependencies: + inherits: 2.0.4 + readable-stream: 3.6.0 + safe-buffer: 5.2.1 + dev: false + engines: + node: '>=4' + resolution: + integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== + /hash.js/1.1.7: + dependencies: + inherits: 2.0.4 + minimalistic-assert: 1.0.1 + dev: false + resolution: + integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== + /hmac-drbg/1.0.1: + dependencies: + hash.js: 1.1.7 + minimalistic-assert: 1.0.1 + minimalistic-crypto-utils: 1.0.1 + dev: false + resolution: + integrity: sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= /html-entities/1.3.1: dev: false resolution: integrity: sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== + /htmlescape/1.1.1: + dev: false + engines: + node: '>=0.10' + resolution: + integrity: sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E= /http-errors/1.7.2: dependencies: depd: 1.1.2 @@ -761,6 +1222,10 @@ packages: npm: '>=1.3.7' resolution: integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + /https-browserify/1.0.0: + dev: false + resolution: + integrity: sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= /iconv-lite/0.4.24: dependencies: safer-buffer: 2.1.2 @@ -790,6 +1255,10 @@ packages: dev: false resolution: integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + /inherits/2.0.1: + dev: false + resolution: + integrity: sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= /inherits/2.0.3: dev: false resolution: @@ -802,12 +1271,38 @@ packages: dev: false resolution: integrity: sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + /inline-source-map/0.6.2: + dependencies: + source-map: 0.5.7 + dev: false + resolution: + integrity: sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU= + /insert-module-globals/7.2.0: + dependencies: + JSONStream: 1.3.5 + acorn-node: 1.8.2 + combine-source-map: 0.8.0 + concat-stream: 1.6.2 + is-buffer: 1.1.6 + path-is-absolute: 1.0.1 + process: 0.11.10 + through2: 2.0.5 + undeclared-identifiers: 1.1.3 + xtend: 4.0.2 + dev: false + hasBin: true + resolution: + integrity: sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw== /ipaddr.js/1.9.0: dev: false engines: node: '>= 0.10' resolution: integrity: sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== + /is-buffer/1.1.6: + dev: false + resolution: + integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== /is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: 1.0.1 @@ -854,10 +1349,26 @@ packages: dev: false resolution: integrity: sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + /json-stable-stringify/0.0.1: + dependencies: + jsonify: 0.0.0 + dev: false + resolution: + integrity: sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U= /json-stringify-safe/5.0.1: dev: false resolution: integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + /jsonify/0.0.0: + dev: false + resolution: + integrity: sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= + /jsonparse/1.3.1: + dev: false + engines: + '0': node >= 0.2.0 + resolution: + integrity: sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= /jsprim/1.4.1: dependencies: assert-plus: 1.0.0 @@ -869,10 +1380,21 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + /labeled-stream-splicer/2.0.2: + dependencies: + inherits: 2.0.4 + stream-splicer: 2.0.1 + dev: false + resolution: + integrity: sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw== /limiter/1.1.5: dev: false resolution: integrity: sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA== + /lodash.memoize/3.0.4: + dev: false + resolution: + integrity: sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= /lodash/4.1.0: dev: false resolution: @@ -890,6 +1412,14 @@ packages: node: '>=10' resolution: integrity: sha512-z6ldnAdhbuWOL6LmMkwptSZGzj+qbRytMKLTbNicwF/bJMjf9U9lqD57RNQUFecvWadEkzy6PDjcNJFFgi19uQ== + /md5.js/1.3.5: + dependencies: + hash-base: 3.1.0 + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== /media-typer/0.3.0: dev: false engines: @@ -906,6 +1436,14 @@ packages: node: '>= 0.6' resolution: integrity: sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + /miller-rabin/4.0.1: + dependencies: + bn.js: 4.11.9 + brorand: 1.1.0 + dev: false + hasBin: true + resolution: + integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== /mime-db/1.42.0: dev: false engines: @@ -953,6 +1491,14 @@ packages: node: '>=10' resolution: integrity: sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA== + /minimalistic-assert/1.0.1: + dev: false + resolution: + integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + /minimalistic-crypto-utils/1.0.1: + dev: false + resolution: + integrity: sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= /minimatch/3.0.4: dependencies: brace-expansion: 1.1.11 @@ -987,6 +1533,29 @@ packages: hasBin: true resolution: integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + /module-deps/6.2.2: + dependencies: + JSONStream: 1.3.5 + browser-resolve: 1.11.3 + cached-path-relative: 1.0.2 + concat-stream: 1.6.2 + defined: 1.0.0 + detective: 5.2.0 + duplexer2: 0.1.4 + inherits: 2.0.4 + parents: 1.0.1 + readable-stream: 2.3.7 + resolve: 1.17.0 + stream-combiner2: 1.1.1 + subarg: 1.0.0 + through2: 2.0.5 + xtend: 4.0.2 + dev: false + engines: + node: '>= 0.8.0' + hasBin: true + resolution: + integrity: sha512-a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w== /ms/2.0.0: dev: false resolution: @@ -1146,6 +1715,10 @@ packages: dev: false resolution: integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + /os-browserify/0.3.0: + dev: false + resolution: + integrity: sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= /os-homedir/1.0.2: dev: false engines: @@ -1165,6 +1738,27 @@ packages: dev: false resolution: integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + /pako/1.0.11: + dev: false + resolution: + integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== + /parents/1.0.1: + dependencies: + path-platform: 0.11.15 + dev: false + resolution: + integrity: sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E= + /parse-asn1/5.1.5: + dependencies: + asn1.js: 4.10.1 + browserify-aes: 1.2.0 + create-hash: 1.2.0 + evp_bytestokey: 1.0.3 + pbkdf2: 3.0.17 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ== /parseqs/0.0.5: dependencies: better-assert: 1.0.2 @@ -1183,16 +1777,42 @@ packages: node: '>= 0.8' resolution: integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + /path-browserify/0.0.1: + dev: false + resolution: + integrity: sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== /path-is-absolute/1.0.1: dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + /path-parse/1.0.6: + dev: false + resolution: + integrity: sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + /path-platform/0.11.15: + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I= /path-to-regexp/0.1.7: dev: false resolution: integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + /pbkdf2/3.0.17: + dependencies: + create-hash: 1.2.0 + create-hmac: 1.1.7 + ripemd160: 2.0.2 + safe-buffer: 5.2.1 + sha.js: 2.4.11 + dev: false + engines: + node: '>=0.12' + resolution: + integrity: sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA== /performance-now/2.1.0: dev: false resolution: @@ -1224,6 +1844,12 @@ packages: dev: false resolution: integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + /process/0.11.10: + dev: false + engines: + node: '>= 0.6.0' + resolution: + integrity: sha1-czIwDoQBYb2j5podHZGn1LwW8YI= /promise/8.1.0: dependencies: asap: 2.0.6 @@ -1243,6 +1869,17 @@ packages: dev: false resolution: integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + /public-encrypt/4.0.3: + dependencies: + bn.js: 4.11.9 + browserify-rsa: 4.0.1 + create-hash: 1.2.0 + parse-asn1: 5.1.5 + randombytes: 2.1.0 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== /pump/3.0.0: dependencies: end-of-stream: 1.4.4 @@ -1250,6 +1887,14 @@ packages: dev: false resolution: integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + /punycode/1.3.2: + dev: false + resolution: + integrity: sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + /punycode/1.4.1: + dev: false + resolution: + integrity: sha1-wNWmOycYgArY4esPpSachN1BhF4= /punycode/2.1.1: dev: false engines: @@ -1268,12 +1913,37 @@ packages: node: '>=0.6' resolution: integrity: sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + /querystring-es3/0.2.1: + dev: false + engines: + node: '>=0.4.x' + resolution: + integrity: sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= + /querystring/0.2.0: + dev: false + engines: + node: '>=0.4.x' + resolution: + integrity: sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= /random-bytes/1.0.0: dev: false engines: node: '>= 0.8' resolution: integrity: sha1-T2ih3Arli9P7lYSMMDJNt11kNgs= + /randombytes/2.1.0: + dependencies: + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + /randomfill/1.0.4: + dependencies: + randombytes: 2.1.0 + safe-buffer: 5.2.1 + dev: false + resolution: + integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== /range-parser/1.2.1: dev: false engines: @@ -1301,6 +1971,12 @@ packages: hasBin: true resolution: integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + /read-only-stream/2.0.0: + dependencies: + readable-stream: 2.3.7 + dev: false + resolution: + integrity: sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A= /readable-stream/2.3.7: dependencies: core-util-is: 1.0.2 @@ -1323,6 +1999,14 @@ packages: node: '>= 6' resolution: integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + /regenerator-runtime/0.11.1: + dev: false + resolution: + integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== + /regenerator-runtime/0.13.5: + dev: false + resolution: + integrity: sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== /request/2.88.2: dependencies: aws-sign2: 0.7.0 @@ -1351,6 +2035,16 @@ packages: node: '>= 6' resolution: integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + /resolve/1.1.7: + dev: false + resolution: + integrity: sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= + /resolve/1.17.0: + dependencies: + path-parse: 1.0.6 + dev: false + resolution: + integrity: sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== /rimraf/2.7.1: dependencies: glob: 7.1.6 @@ -1358,6 +2052,13 @@ packages: hasBin: true resolution: integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + /ripemd160/2.0.2: + dependencies: + hash-base: 3.1.0 + inherits: 2.0.4 + dev: false + resolution: + integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== /safe-buffer/5.1.2: dev: false resolution: @@ -1422,6 +2123,31 @@ packages: dev: false resolution: integrity: sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + /sha.js/2.4.11: + dependencies: + inherits: 2.0.4 + safe-buffer: 5.2.1 + dev: false + hasBin: true + resolution: + integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== + /shasum-object/1.0.0: + dependencies: + fast-safe-stringify: 2.0.7 + dev: false + resolution: + integrity: sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg== + /shasum/1.0.2: + dependencies: + json-stable-stringify: 0.0.1 + sha.js: 2.4.11 + dev: false + resolution: + integrity: sha1-5wEjENj0F/TetXEhUOVni4euVl8= + /shell-quote/1.7.2: + dev: false + resolution: + integrity: sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== /signal-exit/3.0.3: dev: false resolution: @@ -1496,6 +2222,12 @@ packages: dev: false resolution: integrity: sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg== + /source-map/0.5.7: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= /source-map/0.6.1: dev: false engines: @@ -1549,6 +2281,36 @@ packages: node: '>= 0.6' resolution: integrity: sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + /stream-browserify/2.0.2: + dependencies: + inherits: 2.0.4 + readable-stream: 2.3.7 + dev: false + resolution: + integrity: sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== + /stream-combiner2/1.1.1: + dependencies: + duplexer2: 0.1.4 + readable-stream: 2.3.7 + dev: false + resolution: + integrity: sha1-+02KFCDqNidk4hrUeAOXvry0HL4= + /stream-http/3.1.1: + dependencies: + builtin-status-codes: 3.0.0 + inherits: 2.0.4 + readable-stream: 3.6.0 + xtend: 4.0.2 + dev: false + resolution: + integrity: sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg== + /stream-splicer/2.0.1: + dependencies: + inherits: 2.0.4 + readable-stream: 2.3.7 + dev: false + resolution: + integrity: sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg== /stream-throttle/0.1.3: dependencies: commander: 2.20.3 @@ -1612,6 +2374,18 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= + /subarg/1.0.0: + dependencies: + minimist: 1.2.5 + dev: false + resolution: + integrity: sha1-9izxdYHplrSPyWVpn1TAauJouNI= + /syntax-error/1.4.0: + dependencies: + acorn-node: 1.8.2 + dev: false + resolution: + integrity: sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w== /tar-fs/2.1.0: dependencies: chownr: 1.1.4 @@ -1659,6 +2433,25 @@ packages: node: '>=4.5' resolution: integrity: sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + /through/2.3.8: + dev: false + resolution: + integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + /through2/2.0.5: + dependencies: + readable-stream: 2.3.7 + xtend: 4.0.2 + dev: false + resolution: + integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + /timers-browserify/1.4.2: + dependencies: + process: 0.11.10 + dev: false + engines: + node: '>=0.6.0' + resolution: + integrity: sha1-ycWLV1voQHN1y14kYtrO50NZ9B0= /to-array/0.1.4: dev: false resolution: @@ -1678,6 +2471,10 @@ packages: node: '>=0.8' resolution: integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + /tty-browserify/0.0.1: + dev: false + resolution: + integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.2.1 @@ -1697,6 +2494,10 @@ packages: node: '>= 0.6' resolution: integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + /typedarray/0.0.6: + dev: false + resolution: + integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= /uglify-js/3.9.1: dependencies: commander: 2.20.3 @@ -1715,6 +2516,22 @@ packages: node: '>= 0.8' resolution: integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA== + /umd/3.0.3: + dev: false + hasBin: true + resolution: + integrity: sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow== + /undeclared-identifiers/1.1.3: + dependencies: + acorn-node: 1.8.2 + dash-ast: 1.0.0 + get-assigned-identifiers: 1.2.0 + simple-concat: 1.0.0 + xtend: 4.0.2 + dev: false + hasBin: true + resolution: + integrity: sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw== /unpipe/1.0.0: dev: false engines: @@ -1727,10 +2544,29 @@ packages: dev: false resolution: integrity: sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + /url/0.11.0: + dependencies: + punycode: 1.3.2 + querystring: 0.2.0 + dev: false + resolution: + integrity: sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= /util-deprecate/1.0.2: dev: false resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + /util/0.10.3: + dependencies: + inherits: 2.0.1 + dev: false + resolution: + integrity: sha1-evsa/lCAUkZInj23/g7TeTNqwPk= + /util/0.10.4: + dependencies: + inherits: 2.0.3 + dev: false + resolution: + integrity: sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== /utils-merge/1.0.1: dev: false engines: @@ -1758,6 +2594,10 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + /vm-browserify/1.1.2: + dev: false + resolution: + integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== /which-pm-runs/1.0.0: dev: false resolution: @@ -1804,6 +2644,12 @@ packages: node: '>=0.4.0' resolution: integrity: sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= + /xtend/4.0.2: + dev: false + engines: + node: '>=0.4' + resolution: + integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== /yallist/3.1.1: dev: false resolution: @@ -1829,6 +2675,9 @@ shrinkwrapVersion: 3 specifiers: better-sqlite3: ^7.0.1 body-parser: ^1.19.0 + browserify: ^16.5.1 + butterchurn: ^2.6.7 + butterchurn-presets: ^2.4.7 connect-sqlite3: ^0.9.11 endb: ^0.22.9 express: ^4.17.1 diff --git a/utils.js b/utils.js index c6dccec..32992e2 100644 --- a/utils.js +++ b/utils.js @@ -1,5 +1,6 @@ const Writable = require("stream").Writable; const { sendInterval } = require("./config"); +// Deprecated! Inefficent class MultiWritable extends Writable { constructor(options) { super(options); diff --git a/views/index.html b/views/index.html index d45430b..150b573 100644 --- a/views/index.html +++ b/views/index.html @@ -1,3 +1,5 @@ + +
{{{stations}}} diff --git a/views/layouts/main.html b/views/layouts/main.html index 127b1e2..54f90a0 100644 --- a/views/layouts/main.html +++ b/views/layouts/main.html @@ -8,7 +8,7 @@ - +
diff --git a/views/playlists_delete_confirm.html b/views/playlists_delete_confirm.html new file mode 100644 index 0000000..e69de29 From 60b8e0ea18ee77787f04c4e940b085f447cbd669 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sat, 23 May 2020 05:07:25 +0000 Subject: [PATCH 16/29] Failed to add ButterChurn :( --- package.json | 6 +- public/{script.js => modulescript.js} | 44 +- public/openradio.js | 24 + sessions | Bin 12288 -> 12288 bytes shrinkwrap.yaml | 799 -------------------------- views/index.html | 4 +- 6 files changed, 43 insertions(+), 834 deletions(-) rename public/{script.js => modulescript.js} (59%) create mode 100644 public/openradio.js diff --git a/package.json b/package.json index d16913b..4624ed9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "description": "A simple Node app built on Express, instantly up and running.", "main": "server.js", "scripts": { - "start": "browserify public/script.js -o public/final.js; node server.js" + "start": "node server.js" }, "dependencies": { "express": "^4.17.1", @@ -26,8 +26,8 @@ "sqlite3": "^4.2.0", "better-sqlite3": "^7.0.1", "butterchurn": "^2.6.7", - "butterchurn-presets": "^2.4.7", - "browserify": "^16.5.1" + "butterchurn-presets": "^2.4.7" + }, "engines": { "node": "10.x" diff --git a/public/script.js b/public/modulescript.js similarity index 59% rename from public/script.js rename to public/modulescript.js index df9ccca..853492e 100644 --- a/public/script.js +++ b/public/modulescript.js @@ -1,40 +1,21 @@ -function controllerclick(event) { - console.log("Clicked"); - console.log(event); - if (event.ctrlKey) { - $("#streamelem").toggle(); - } else { - } -} -$(function() { - $("#streamelem").hide(); - let controller = document.getElementById("controller"); - controller.addEventListener("click", controllerclick); - document.body.onkeyup = KeyPress; -}); -function play(dest, elem) { - let audioelem = document.getElementById("streamelem"); - audioelem.src = dest; - audioelem.play(); - //console.log(elem); - //console.log(elem.parentElement.children[0]); - let name = elem.parentElement.innerText; - $("#station-name-display").text(name); - console.log("Station Name is " + name); -} -// ButterChun + +// ButterChurn +// My failed attempt + function enableButterchurn() { let audioContext = new AudioContext(); let canvas = document.createElement("canvas"); document.body.appendChild(canvas); let audio = document.getElementById("streamelem"); - const analyserNode = new AnalyserNode(audioContext, { + const gainNode = new AnalyserNode(audioContext, { fftSize: 2048, smoothingTimeConstant: 0.5 - }); + }) + //let gainNode = audioContext.createGain(); var src = audioContext.createMediaElementSource(audio); - src.connect(analyserNode); - console.log(butterchurn.default); + gainNode.connect(audioContext.destination); + src.connect(gainNode); + //console.log(butterchurn.default); const visualizer = butterchurn.default.createVisualizer( audioContext, canvas, @@ -43,10 +24,10 @@ function enableButterchurn() { height: 600 } ); - +console.log("No errors I guess"); // get audioNode from audio source or microphone - visualizer.connectAudio(anaylserNode); + visualizer.connectAudio(src); // load a preset @@ -85,3 +66,4 @@ function KeyPress(e) { } else { } } +window.KeyPress = KeyPress; diff --git a/public/openradio.js b/public/openradio.js new file mode 100644 index 0000000..a22179c --- /dev/null +++ b/public/openradio.js @@ -0,0 +1,24 @@ +function controllerclick(event) { + console.log("Clicked"); + console.log(event); + if (event.ctrlKey) { + $("#streamelem").toggle(); + } else { + } +} +$(function() { + $("#streamelem").hide(); + let controller = document.getElementById("controller"); + controller.addEventListener("click", controllerclick); + document.body.onkeyup = window.KeyPress; +}); +function play(dest, elem) { + let audioelem = document.getElementById("streamelem"); + audioelem.src = dest; + audioelem.play(); + //console.log(elem); + //console.log(elem.parentElement.children[0]); + let name = elem.parentElement.innerText; + $("#station-name-display").text(name); + console.log("Station Name is " + name); +} \ No newline at end of file diff --git a/sessions b/sessions index 0ebee46905a945b7a8c44d7a4dc310abd8783b32..91bc51597135b1d6bbd06deac4bd11afb7f75ed9 100644 GIT binary patch delta 88 zcmZojXh@hK#l$jgqKp%e+?Zf5$J9|ed7+#Ji{09`gvoXCswyTrN~skEnMJ9^N>)ln r21W+D2Bx~k1|bF}R;C74#wL2^MrMw!SI=t)Utd delta 88 zcmZojXh@hK#l);MQN{^KZcMP3V`^iZyiiVq#VV&KVRD_ks)~hIRfl9iH? rfsui(fvK*sL5P8|m9d$Xp^2W6xy9t;@&=pT= 0.6' resolution: integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - /acorn-node/1.8.2: - dependencies: - acorn: 7.2.0 - acorn-walk: 7.1.1 - xtend: 4.0.2 - dev: false - resolution: - integrity: sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== - /acorn-walk/7.1.1: - dev: false - engines: - node: '>=0.4.0' - resolution: - integrity: sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== - /acorn/7.2.0: - dev: false - engines: - node: '>=0.4.0' - hasBin: true - resolution: - integrity: sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ== /after/0.8.2: dev: false resolution: @@ -114,14 +84,6 @@ packages: dev: false resolution: integrity: sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= - /asn1.js/4.10.1: - dependencies: - bn.js: 4.11.9 - inherits: 2.0.4 - minimalistic-assert: 1.0.1 - dev: false - resolution: - integrity: sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw== /asn1/0.2.4: dependencies: safer-buffer: 2.1.2 @@ -134,13 +96,6 @@ packages: node: '>=0.8' resolution: integrity: sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - /assert/1.5.0: - dependencies: - object-assign: 4.1.1 - util: 0.10.3 - dev: false - resolution: - integrity: sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== /async-limiter/1.0.1: dev: false resolution: @@ -231,14 +186,6 @@ packages: dev: false resolution: integrity: sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== - /bn.js/4.11.9: - dev: false - resolution: - integrity: sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== - /bn.js/5.1.2: - dev: false - resolution: - integrity: sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== /body-parser/1.19.0: dependencies: bytes: 3.1.0 @@ -263,158 +210,10 @@ packages: dev: false resolution: integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - /brorand/1.1.0: - dev: false - resolution: - integrity: sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= - /browser-pack/6.1.0: - dependencies: - JSONStream: 1.3.5 - combine-source-map: 0.8.0 - defined: 1.0.0 - safe-buffer: 5.2.1 - through2: 2.0.5 - umd: 3.0.3 - dev: false - hasBin: true - resolution: - integrity: sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA== - /browser-resolve/1.11.3: - dependencies: - resolve: 1.1.7 - dev: false - resolution: - integrity: sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ== - /browserify-aes/1.2.0: - dependencies: - buffer-xor: 1.0.3 - cipher-base: 1.0.4 - create-hash: 1.2.0 - evp_bytestokey: 1.0.3 - inherits: 2.0.4 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== - /browserify-cipher/1.0.1: - dependencies: - browserify-aes: 1.2.0 - browserify-des: 1.0.2 - evp_bytestokey: 1.0.3 - dev: false - resolution: - integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== - /browserify-des/1.0.2: - dependencies: - cipher-base: 1.0.4 - des.js: 1.0.1 - inherits: 2.0.4 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== - /browserify-rsa/4.0.1: - dependencies: - bn.js: 4.11.9 - randombytes: 2.1.0 - dev: false - resolution: - integrity: sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ= - /browserify-sign/4.2.0: - dependencies: - bn.js: 5.1.2 - browserify-rsa: 4.0.1 - create-hash: 1.2.0 - create-hmac: 1.1.7 - elliptic: 6.5.2 - inherits: 2.0.4 - parse-asn1: 5.1.5 - readable-stream: 3.6.0 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA== - /browserify-zlib/0.2.0: - dependencies: - pako: 1.0.11 - dev: false - resolution: - integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== - /browserify/16.5.1: - dependencies: - JSONStream: 1.3.5 - assert: 1.5.0 - browser-pack: 6.1.0 - browser-resolve: 1.11.3 - browserify-zlib: 0.2.0 - buffer: 5.2.1 - cached-path-relative: 1.0.2 - concat-stream: 1.6.2 - console-browserify: 1.2.0 - constants-browserify: 1.0.0 - crypto-browserify: 3.12.0 - defined: 1.0.0 - deps-sort: 2.0.1 - domain-browser: 1.2.0 - duplexer2: 0.1.4 - events: 2.1.0 - glob: 7.1.6 - has: 1.0.3 - htmlescape: 1.1.1 - https-browserify: 1.0.0 - inherits: 2.0.4 - insert-module-globals: 7.2.0 - labeled-stream-splicer: 2.0.2 - mkdirp-classic: 0.5.3 - module-deps: 6.2.2 - os-browserify: 0.3.0 - parents: 1.0.1 - path-browserify: 0.0.1 - process: 0.11.10 - punycode: 1.4.1 - querystring-es3: 0.2.1 - read-only-stream: 2.0.0 - readable-stream: 2.3.7 - resolve: 1.17.0 - shasum: 1.0.2 - shell-quote: 1.7.2 - stream-browserify: 2.0.2 - stream-http: 3.1.1 - string_decoder: 1.3.0 - subarg: 1.0.0 - syntax-error: 1.4.0 - through2: 2.0.5 - timers-browserify: 1.4.2 - tty-browserify: 0.0.1 - url: 0.11.0 - util: 0.10.4 - vm-browserify: 1.1.2 - xtend: 4.0.2 - dev: false - engines: - node: '>= 0.8' - hasBin: true - resolution: - integrity: sha512-EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A== - /buffer-from/1.1.1: - dev: false - resolution: - integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== /buffer-json/2.0.0: dev: false resolution: integrity: sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== - /buffer-xor/1.0.3: - dev: false - resolution: - integrity: sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= - /buffer/5.2.1: - dependencies: - base64-js: 1.3.1 - ieee754: 1.1.13 - dev: false - resolution: - integrity: sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg== /buffer/5.6.0: dependencies: base64-js: 1.3.1 @@ -422,10 +221,6 @@ packages: dev: false resolution: integrity: sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw== - /builtin-status-codes/3.0.0: - dev: false - resolution: - integrity: sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= /butterchurn-presets/2.4.7: dependencies: babel-runtime: 6.26.0 @@ -447,10 +242,6 @@ packages: node: '>= 0.8' resolution: integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - /cached-path-relative/1.0.2: - dev: false - resolution: - integrity: sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg== /callsite/1.0.0: dev: false resolution: @@ -463,28 +254,12 @@ packages: dev: false resolution: integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - /cipher-base/1.0.4: - dependencies: - inherits: 2.0.4 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== /code-point-at/1.1.0: dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - /combine-source-map/0.8.0: - dependencies: - convert-source-map: 1.1.3 - inline-source-map: 0.6.2 - lodash.memoize: 3.0.4 - source-map: 0.5.7 - dev: false - resolution: - integrity: sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos= /combined-stream/1.0.8: dependencies: delayed-stream: 1.0.0 @@ -513,17 +288,6 @@ packages: dev: false resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - /concat-stream/1.6.2: - dependencies: - buffer-from: 1.1.1 - inherits: 2.0.4 - readable-stream: 2.3.7 - typedarray: 0.0.6 - dev: false - engines: - '0': node >= 0.8 - resolution: - integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== /connect-sqlite3/0.9.11: dependencies: sqlite3: 4.1.1 @@ -532,18 +296,10 @@ packages: node: '>=0.4.x' resolution: integrity: sha1-TlQVXcLq3ypZmDhbLzXoPdkkCy0= - /console-browserify/1.2.0: - dev: false - resolution: - integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== /console-control-strings/1.1.0: dev: false resolution: integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - /constants-browserify/1.0.0: - dev: false - resolution: - integrity: sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= /content-disposition/0.5.3: dependencies: safe-buffer: 5.1.2 @@ -558,10 +314,6 @@ packages: node: '>= 0.6' resolution: integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - /convert-source-map/1.1.3: - dev: false - resolution: - integrity: sha1-SCnId+n+SbMWHzvzZziI4gRpmGA= /cookie-signature/1.0.6: dev: false resolution: @@ -588,54 +340,6 @@ packages: dev: false resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - /create-ecdh/4.0.3: - dependencies: - bn.js: 4.11.9 - elliptic: 6.5.2 - dev: false - resolution: - integrity: sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw== - /create-hash/1.2.0: - dependencies: - cipher-base: 1.0.4 - inherits: 2.0.4 - md5.js: 1.3.5 - ripemd160: 2.0.2 - sha.js: 2.4.11 - dev: false - resolution: - integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== - /create-hmac/1.1.7: - dependencies: - cipher-base: 1.0.4 - create-hash: 1.2.0 - inherits: 2.0.4 - ripemd160: 2.0.2 - safe-buffer: 5.2.1 - sha.js: 2.4.11 - dev: false - resolution: - integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== - /crypto-browserify/3.12.0: - dependencies: - browserify-cipher: 1.0.1 - browserify-sign: 4.2.0 - create-ecdh: 4.0.3 - create-hash: 1.2.0 - create-hmac: 1.1.7 - diffie-hellman: 5.0.3 - inherits: 2.0.4 - pbkdf2: 3.0.17 - public-encrypt: 4.0.3 - randombytes: 2.1.0 - randomfill: 1.0.4 - dev: false - resolution: - integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== - /dash-ast/1.0.0: - dev: false - resolution: - integrity: sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA== /dashdash/1.14.1: dependencies: assert-plus: 1.0.0 @@ -690,10 +394,6 @@ packages: node: '>= 0.4' resolution: integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - /defined/1.0.0: - dev: false - resolution: - integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= /delayed-stream/1.0.0: dev: false engines: @@ -716,23 +416,6 @@ packages: node: '>= 0.8' resolution: integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - /deps-sort/2.0.1: - dependencies: - JSONStream: 1.3.5 - shasum-object: 1.0.0 - subarg: 1.0.0 - through2: 2.0.5 - dev: false - hasBin: true - resolution: - integrity: sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw== - /des.js/1.0.1: - dependencies: - inherits: 2.0.4 - minimalistic-assert: 1.0.1 - dev: false - resolution: - integrity: sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== /destroy/1.0.4: dev: false resolution: @@ -744,38 +427,6 @@ packages: hasBin: true resolution: integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - /detective/5.2.0: - dependencies: - acorn-node: 1.8.2 - defined: 1.0.0 - minimist: 1.2.5 - dev: false - engines: - node: '>=0.8.0' - hasBin: true - resolution: - integrity: sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== - /diffie-hellman/5.0.3: - dependencies: - bn.js: 4.11.9 - miller-rabin: 4.0.1 - randombytes: 2.1.0 - dev: false - resolution: - integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== - /domain-browser/1.2.0: - dev: false - engines: - node: '>=0.4' - npm: '>=1.2' - resolution: - integrity: sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== - /duplexer2/0.1.4: - dependencies: - readable-stream: 2.3.7 - dev: false - resolution: - integrity: sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= /ecc-jsbn/0.1.2: dependencies: jsbn: 0.1.1 @@ -791,18 +442,6 @@ packages: dev: false resolution: integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - /elliptic/6.5.2: - dependencies: - bn.js: 4.11.9 - brorand: 1.1.0 - hash.js: 1.1.7 - hmac-drbg: 1.0.1 - inherits: 2.0.4 - minimalistic-assert: 1.0.1 - minimalistic-crypto-utils: 1.0.1 - dev: false - resolution: - integrity: sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== /encodeurl/1.0.2: dev: false engines: @@ -871,19 +510,6 @@ packages: node: '>= 0.6' resolution: integrity: sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - /events/2.1.0: - dev: false - engines: - node: '>=0.4.x' - resolution: - integrity: sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg== - /evp_bytestokey/1.0.3: - dependencies: - md5.js: 1.3.5 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== /expand-template/2.0.3: dev: false engines: @@ -978,10 +604,6 @@ packages: dev: false resolution: integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - /fast-safe-stringify/2.0.7: - dev: false - resolution: - integrity: sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== /file-uri-to-path/1.0.0: dev: false resolution: @@ -1066,10 +688,6 @@ packages: dev: false resolution: integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - /get-assigned-identifiers/1.2.0: - dev: false - resolution: - integrity: sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ== /getpass/0.1.7: dependencies: assert-plus: 1.0.0 @@ -1144,49 +762,10 @@ packages: dev: false resolution: integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - /has/1.0.3: - dependencies: - function-bind: 1.1.1 - dev: false - engines: - node: '>= 0.4.0' - resolution: - integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - /hash-base/3.1.0: - dependencies: - inherits: 2.0.4 - readable-stream: 3.6.0 - safe-buffer: 5.2.1 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== - /hash.js/1.1.7: - dependencies: - inherits: 2.0.4 - minimalistic-assert: 1.0.1 - dev: false - resolution: - integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== - /hmac-drbg/1.0.1: - dependencies: - hash.js: 1.1.7 - minimalistic-assert: 1.0.1 - minimalistic-crypto-utils: 1.0.1 - dev: false - resolution: - integrity: sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= /html-entities/1.3.1: dev: false resolution: integrity: sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA== - /htmlescape/1.1.1: - dev: false - engines: - node: '>=0.10' - resolution: - integrity: sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E= /http-errors/1.7.2: dependencies: depd: 1.1.2 @@ -1222,10 +801,6 @@ packages: npm: '>=1.3.7' resolution: integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - /https-browserify/1.0.0: - dev: false - resolution: - integrity: sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= /iconv-lite/0.4.24: dependencies: safer-buffer: 2.1.2 @@ -1255,10 +830,6 @@ packages: dev: false resolution: integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - /inherits/2.0.1: - dev: false - resolution: - integrity: sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= /inherits/2.0.3: dev: false resolution: @@ -1271,38 +842,12 @@ packages: dev: false resolution: integrity: sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== - /inline-source-map/0.6.2: - dependencies: - source-map: 0.5.7 - dev: false - resolution: - integrity: sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU= - /insert-module-globals/7.2.0: - dependencies: - JSONStream: 1.3.5 - acorn-node: 1.8.2 - combine-source-map: 0.8.0 - concat-stream: 1.6.2 - is-buffer: 1.1.6 - path-is-absolute: 1.0.1 - process: 0.11.10 - through2: 2.0.5 - undeclared-identifiers: 1.1.3 - xtend: 4.0.2 - dev: false - hasBin: true - resolution: - integrity: sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw== /ipaddr.js/1.9.0: dev: false engines: node: '>= 0.10' resolution: integrity: sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== - /is-buffer/1.1.6: - dev: false - resolution: - integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== /is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: 1.0.1 @@ -1349,26 +894,10 @@ packages: dev: false resolution: integrity: sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - /json-stable-stringify/0.0.1: - dependencies: - jsonify: 0.0.0 - dev: false - resolution: - integrity: sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U= /json-stringify-safe/5.0.1: dev: false resolution: integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - /jsonify/0.0.0: - dev: false - resolution: - integrity: sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= - /jsonparse/1.3.1: - dev: false - engines: - '0': node >= 0.2.0 - resolution: - integrity: sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= /jsprim/1.4.1: dependencies: assert-plus: 1.0.0 @@ -1380,21 +909,10 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - /labeled-stream-splicer/2.0.2: - dependencies: - inherits: 2.0.4 - stream-splicer: 2.0.1 - dev: false - resolution: - integrity: sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw== /limiter/1.1.5: dev: false resolution: integrity: sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA== - /lodash.memoize/3.0.4: - dev: false - resolution: - integrity: sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= /lodash/4.1.0: dev: false resolution: @@ -1412,14 +930,6 @@ packages: node: '>=10' resolution: integrity: sha512-z6ldnAdhbuWOL6LmMkwptSZGzj+qbRytMKLTbNicwF/bJMjf9U9lqD57RNQUFecvWadEkzy6PDjcNJFFgi19uQ== - /md5.js/1.3.5: - dependencies: - hash-base: 3.1.0 - inherits: 2.0.4 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== /media-typer/0.3.0: dev: false engines: @@ -1436,14 +946,6 @@ packages: node: '>= 0.6' resolution: integrity: sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - /miller-rabin/4.0.1: - dependencies: - bn.js: 4.11.9 - brorand: 1.1.0 - dev: false - hasBin: true - resolution: - integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== /mime-db/1.42.0: dev: false engines: @@ -1491,14 +993,6 @@ packages: node: '>=10' resolution: integrity: sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA== - /minimalistic-assert/1.0.1: - dev: false - resolution: - integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - /minimalistic-crypto-utils/1.0.1: - dev: false - resolution: - integrity: sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= /minimatch/3.0.4: dependencies: brace-expansion: 1.1.11 @@ -1533,29 +1027,6 @@ packages: hasBin: true resolution: integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - /module-deps/6.2.2: - dependencies: - JSONStream: 1.3.5 - browser-resolve: 1.11.3 - cached-path-relative: 1.0.2 - concat-stream: 1.6.2 - defined: 1.0.0 - detective: 5.2.0 - duplexer2: 0.1.4 - inherits: 2.0.4 - parents: 1.0.1 - readable-stream: 2.3.7 - resolve: 1.17.0 - stream-combiner2: 1.1.1 - subarg: 1.0.0 - through2: 2.0.5 - xtend: 4.0.2 - dev: false - engines: - node: '>= 0.8.0' - hasBin: true - resolution: - integrity: sha512-a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w== /ms/2.0.0: dev: false resolution: @@ -1715,10 +1186,6 @@ packages: dev: false resolution: integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - /os-browserify/0.3.0: - dev: false - resolution: - integrity: sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= /os-homedir/1.0.2: dev: false engines: @@ -1738,27 +1205,6 @@ packages: dev: false resolution: integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - /pako/1.0.11: - dev: false - resolution: - integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== - /parents/1.0.1: - dependencies: - path-platform: 0.11.15 - dev: false - resolution: - integrity: sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E= - /parse-asn1/5.1.5: - dependencies: - asn1.js: 4.10.1 - browserify-aes: 1.2.0 - create-hash: 1.2.0 - evp_bytestokey: 1.0.3 - pbkdf2: 3.0.17 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ== /parseqs/0.0.5: dependencies: better-assert: 1.0.2 @@ -1777,42 +1223,16 @@ packages: node: '>= 0.8' resolution: integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - /path-browserify/0.0.1: - dev: false - resolution: - integrity: sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== /path-is-absolute/1.0.1: dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - /path-parse/1.0.6: - dev: false - resolution: - integrity: sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== - /path-platform/0.11.15: - dev: false - engines: - node: '>= 0.8.0' - resolution: - integrity: sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I= /path-to-regexp/0.1.7: dev: false resolution: integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - /pbkdf2/3.0.17: - dependencies: - create-hash: 1.2.0 - create-hmac: 1.1.7 - ripemd160: 2.0.2 - safe-buffer: 5.2.1 - sha.js: 2.4.11 - dev: false - engines: - node: '>=0.12' - resolution: - integrity: sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA== /performance-now/2.1.0: dev: false resolution: @@ -1844,12 +1264,6 @@ packages: dev: false resolution: integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - /process/0.11.10: - dev: false - engines: - node: '>= 0.6.0' - resolution: - integrity: sha1-czIwDoQBYb2j5podHZGn1LwW8YI= /promise/8.1.0: dependencies: asap: 2.0.6 @@ -1869,17 +1283,6 @@ packages: dev: false resolution: integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - /public-encrypt/4.0.3: - dependencies: - bn.js: 4.11.9 - browserify-rsa: 4.0.1 - create-hash: 1.2.0 - parse-asn1: 5.1.5 - randombytes: 2.1.0 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== /pump/3.0.0: dependencies: end-of-stream: 1.4.4 @@ -1887,14 +1290,6 @@ packages: dev: false resolution: integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - /punycode/1.3.2: - dev: false - resolution: - integrity: sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - /punycode/1.4.1: - dev: false - resolution: - integrity: sha1-wNWmOycYgArY4esPpSachN1BhF4= /punycode/2.1.1: dev: false engines: @@ -1913,37 +1308,12 @@ packages: node: '>=0.6' resolution: integrity: sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - /querystring-es3/0.2.1: - dev: false - engines: - node: '>=0.4.x' - resolution: - integrity: sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= - /querystring/0.2.0: - dev: false - engines: - node: '>=0.4.x' - resolution: - integrity: sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= /random-bytes/1.0.0: dev: false engines: node: '>= 0.8' resolution: integrity: sha1-T2ih3Arli9P7lYSMMDJNt11kNgs= - /randombytes/2.1.0: - dependencies: - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - /randomfill/1.0.4: - dependencies: - randombytes: 2.1.0 - safe-buffer: 5.2.1 - dev: false - resolution: - integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== /range-parser/1.2.1: dev: false engines: @@ -1971,12 +1341,6 @@ packages: hasBin: true resolution: integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - /read-only-stream/2.0.0: - dependencies: - readable-stream: 2.3.7 - dev: false - resolution: - integrity: sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A= /readable-stream/2.3.7: dependencies: core-util-is: 1.0.2 @@ -2035,16 +1399,6 @@ packages: node: '>= 6' resolution: integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - /resolve/1.1.7: - dev: false - resolution: - integrity: sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= - /resolve/1.17.0: - dependencies: - path-parse: 1.0.6 - dev: false - resolution: - integrity: sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== /rimraf/2.7.1: dependencies: glob: 7.1.6 @@ -2052,13 +1406,6 @@ packages: hasBin: true resolution: integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - /ripemd160/2.0.2: - dependencies: - hash-base: 3.1.0 - inherits: 2.0.4 - dev: false - resolution: - integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== /safe-buffer/5.1.2: dev: false resolution: @@ -2123,31 +1470,6 @@ packages: dev: false resolution: integrity: sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - /sha.js/2.4.11: - dependencies: - inherits: 2.0.4 - safe-buffer: 5.2.1 - dev: false - hasBin: true - resolution: - integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== - /shasum-object/1.0.0: - dependencies: - fast-safe-stringify: 2.0.7 - dev: false - resolution: - integrity: sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg== - /shasum/1.0.2: - dependencies: - json-stable-stringify: 0.0.1 - sha.js: 2.4.11 - dev: false - resolution: - integrity: sha1-5wEjENj0F/TetXEhUOVni4euVl8= - /shell-quote/1.7.2: - dev: false - resolution: - integrity: sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== /signal-exit/3.0.3: dev: false resolution: @@ -2222,12 +1544,6 @@ packages: dev: false resolution: integrity: sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg== - /source-map/0.5.7: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= /source-map/0.6.1: dev: false engines: @@ -2281,36 +1597,6 @@ packages: node: '>= 0.6' resolution: integrity: sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - /stream-browserify/2.0.2: - dependencies: - inherits: 2.0.4 - readable-stream: 2.3.7 - dev: false - resolution: - integrity: sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== - /stream-combiner2/1.1.1: - dependencies: - duplexer2: 0.1.4 - readable-stream: 2.3.7 - dev: false - resolution: - integrity: sha1-+02KFCDqNidk4hrUeAOXvry0HL4= - /stream-http/3.1.1: - dependencies: - builtin-status-codes: 3.0.0 - inherits: 2.0.4 - readable-stream: 3.6.0 - xtend: 4.0.2 - dev: false - resolution: - integrity: sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg== - /stream-splicer/2.0.1: - dependencies: - inherits: 2.0.4 - readable-stream: 2.3.7 - dev: false - resolution: - integrity: sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg== /stream-throttle/0.1.3: dependencies: commander: 2.20.3 @@ -2374,18 +1660,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /subarg/1.0.0: - dependencies: - minimist: 1.2.5 - dev: false - resolution: - integrity: sha1-9izxdYHplrSPyWVpn1TAauJouNI= - /syntax-error/1.4.0: - dependencies: - acorn-node: 1.8.2 - dev: false - resolution: - integrity: sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w== /tar-fs/2.1.0: dependencies: chownr: 1.1.4 @@ -2433,25 +1707,6 @@ packages: node: '>=4.5' resolution: integrity: sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - /through/2.3.8: - dev: false - resolution: - integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - /through2/2.0.5: - dependencies: - readable-stream: 2.3.7 - xtend: 4.0.2 - dev: false - resolution: - integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - /timers-browserify/1.4.2: - dependencies: - process: 0.11.10 - dev: false - engines: - node: '>=0.6.0' - resolution: - integrity: sha1-ycWLV1voQHN1y14kYtrO50NZ9B0= /to-array/0.1.4: dev: false resolution: @@ -2471,10 +1726,6 @@ packages: node: '>=0.8' resolution: integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - /tty-browserify/0.0.1: - dev: false - resolution: - integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.2.1 @@ -2494,10 +1745,6 @@ packages: node: '>= 0.6' resolution: integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - /typedarray/0.0.6: - dev: false - resolution: - integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= /uglify-js/3.9.1: dependencies: commander: 2.20.3 @@ -2516,22 +1763,6 @@ packages: node: '>= 0.8' resolution: integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA== - /umd/3.0.3: - dev: false - hasBin: true - resolution: - integrity: sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow== - /undeclared-identifiers/1.1.3: - dependencies: - acorn-node: 1.8.2 - dash-ast: 1.0.0 - get-assigned-identifiers: 1.2.0 - simple-concat: 1.0.0 - xtend: 4.0.2 - dev: false - hasBin: true - resolution: - integrity: sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw== /unpipe/1.0.0: dev: false engines: @@ -2544,29 +1775,10 @@ packages: dev: false resolution: integrity: sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== - /url/0.11.0: - dependencies: - punycode: 1.3.2 - querystring: 0.2.0 - dev: false - resolution: - integrity: sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= /util-deprecate/1.0.2: dev: false resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - /util/0.10.3: - dependencies: - inherits: 2.0.1 - dev: false - resolution: - integrity: sha1-evsa/lCAUkZInj23/g7TeTNqwPk= - /util/0.10.4: - dependencies: - inherits: 2.0.3 - dev: false - resolution: - integrity: sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== /utils-merge/1.0.1: dev: false engines: @@ -2594,10 +1806,6 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - /vm-browserify/1.1.2: - dev: false - resolution: - integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== /which-pm-runs/1.0.0: dev: false resolution: @@ -2644,12 +1852,6 @@ packages: node: '>=0.4.0' resolution: integrity: sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= - /xtend/4.0.2: - dev: false - engines: - node: '>=0.4' - resolution: - integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== /yallist/3.1.1: dev: false resolution: @@ -2675,7 +1877,6 @@ shrinkwrapVersion: 3 specifiers: better-sqlite3: ^7.0.1 body-parser: ^1.19.0 - browserify: ^16.5.1 butterchurn: ^2.6.7 butterchurn-presets: ^2.4.7 connect-sqlite3: ^0.9.11 diff --git a/views/index.html b/views/index.html index 150b573..2179e8e 100644 --- a/views/index.html +++ b/views/index.html @@ -1,5 +1,7 @@ - + + +
{{{stations}}} From 770782d01ec21d2bec28e7255e930a079aea1ebf Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sat, 23 May 2020 21:08:07 +0000 Subject: [PATCH 17/29] Finished admin commands --- public/playlisteditor.js | 5 +++ server.js | 63 +++++++++++++++++++++++++--- sessions | Bin 12288 -> 12288 bytes utils.js | 2 +- views/admin_playlist_item.html | 6 ++- views/playlist_delete_confirm.html | 16 +++++++ views/playlist_editor.html | 17 +++++++- views/playlists_delete_confirm.html | 0 8 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 public/playlisteditor.js create mode 100644 views/playlist_delete_confirm.html delete mode 100644 views/playlists_delete_confirm.html diff --git a/public/playlisteditor.js b/public/playlisteditor.js new file mode 100644 index 0000000..0dd005e --- /dev/null +++ b/public/playlisteditor.js @@ -0,0 +1,5 @@ +function deleteitem(pos,elem){ + console.log("Deleting ",pos); + $("#del-number").val(pos); + $("#playlist-item-delete-form").submit(); +} \ No newline at end of file diff --git a/server.js b/server.js index 4c7eb96..79f123d 100644 --- a/server.js +++ b/server.js @@ -96,7 +96,8 @@ app.get("/playlist_editor/:name", async function(req, res) { output + admin_playlist_item_template({ name: playlist[i].name, - count: playlist[i].source + count: playlist[i].source, + pos: i.toString() }); } res.render(__dirname + "/views/playlist_editor.html", { @@ -119,7 +120,17 @@ app.post("/playlist_editor/:name", async function(req, res) { } if (await playlists.has(name)) { let playlist = await playlists.get(name); - playlist.push({ name: req.body.item_name, source: req.body.item_source }); + if (!req.body.new_item_pos || req.body.new_item_pos == "") { + playlist.push({ + name: req.body.item_name, + source: req.body.item_source + }); + } else { + playlist.splice(req.body.new_item_pos, 0, { + name: req.body.item_name, + source: req.body.item_source + }); + } await playlists.set(name, playlist); res.redirect("/playlist_editor/" + name); } else { @@ -151,24 +162,66 @@ app.get("/edit_playlists", async function(req, res) { }); app.post("/edit_playlists", async function(req, res) { if (req.session.logintime) { - playlists.set(req.body.playlist_name, []); + await playlists.set(req.body.playlist_name, []); res.redirect("/edit_playlists"); } else { res.send("Please log in"); } res.redirect("/edit_playlists"); }); +app.post("/delete_playlist_item/:name", async function(req, res) { + if (req.session.logintime) { + let name = req.params.name; + if (name && (await playlists.has(name))) { + let playlist = await playlists.get(name); + if (req.body.delete_item_pos) { + let pos = req.body.delete_item_pos; + if (pos < playlist.length) { + playlist.splice(pos, 1); + await playlists.set(name, playlist); + res.redirect("/playlist_editor/" + name); + } else { + res.send("Invalid Position"); + } + } else { + res.send("Specify a item index"); + } + } else { + res.send("Invalid Playlist Name"); + } + } else { + res.send("Please log in"); + } + res.redirect("/edit_playlists"); +}); app.get("/delete_playlist/:name", async function(req, res) { if (req.session.logintime) { let name = req.params.name; if (name) { if (await playlists.has(name)) { - res.render(__dirname + "/views/playlists_delete_confirm.html", { + res.render(__dirname + "/views/playlist_delete_confirm.html", { ...config.webexports, ...{ playlist_name: name } }); } else { - console.log("Playlist doesn't exist"); + res.send("Playlist doesn't exist"); + } + } else { + res.send("Provide a name"); + } + } else { + res.send("Please log in"); + } +}); +app.post("/delete_playlist/:name", async function(req, res) { + if (req.session.logintime) { + let name = req.params.name; + if (name) { + if (await playlists.has(name)) { + await playlists.delete(name); + res.redirect("/edit_playlists"); + } else { + res.send("Playlist doesn't exist"); } } else { res.send("Provide a name"); diff --git a/sessions b/sessions index 91bc51597135b1d6bbd06deac4bd11afb7f75ed9..0ed01f19f70edf40368c93f8c378141a0f7e22e2 100644 GIT binary patch delta 205 zcmZojXh@hK#l(7dqKp%e+?cS8pKT5UzaQV6jfD?+*%^~rec7A%C*RjsV0S84b67c5 zU~-+j9k;2Kk*SrTsh+u!<>ce?7MzWG-8LvH%WBtc0IIa*F*39=FtswZ)H5&yDYaw) zD%F|1P)>uTXtx+hiR$D}auPg7237_JR)%JJM#iQ_W~PP)rsk%#Tnr2hO#E9I k_;2xV*(|8g#?R;tat{{name}}: {{link}} \ No newline at end of file +{{name}}: {{link}} +
+ +
diff --git a/views/playlist_delete_confirm.html b/views/playlist_delete_confirm.html new file mode 100644 index 0000000..d5414b7 --- /dev/null +++ b/views/playlist_delete_confirm.html @@ -0,0 +1,16 @@ +
+

+ Confirm Deletion of {{playlist_name}} +

+

+ Are you sure you want to do this. Many items may be deleted. +

+
+ + + No I didn't want this! + +
+
diff --git a/views/playlist_editor.html b/views/playlist_editor.html index 95c365e..d7bc6ef 100644 --- a/views/playlist_editor.html +++ b/views/playlist_editor.html @@ -1,8 +1,14 @@ +

Editing playlist {{playlist_name}}

- back + Go Back + Delete Playlist
{{{playlist_items}}}
@@ -18,8 +24,17 @@

name="item_source" placeholder="Item source. Usually the url" /> + Optional Position: +
+ +
+

+ If another administrator edits the playlist and you delete an item the wrong + item may be deleted. So please do not delete an item a long period after the + page has loaded. +

diff --git a/views/playlists_delete_confirm.html b/views/playlists_delete_confirm.html deleted file mode 100644 index e69de29..0000000 From 325eb4668b8e4e725628f39d5b7b58166b643231 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sat, 23 May 2020 21:13:07 +0000 Subject: [PATCH 18/29] Autoshutdown streams added, fixed bug --- server.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/server.js b/server.js index 79f123d..0c40aba 100644 --- a/server.js +++ b/server.js @@ -261,7 +261,10 @@ async function playContent(name, outputStream, realOutputStream, finish) { //rawStream.unpipe(processer); }); let consumed = false; - + function replay() { + if(!isAnyoneListening(name)){return;} + playContent(name, outputStream, outputStream, replay); + } //console.log(outputStream); let processer = ffmpeg(rawStream, { highWaterMark: config.inputChunkSize }) .withNoVideo() @@ -273,7 +276,7 @@ async function playContent(name, outputStream, realOutputStream, finish) { .on("end", function() { //console.warn("Unexpected end") consumed = true; /*this.unpipe(outputStream)*/ - playContent(name, outputStream, outputStream); + replay(); }) //, { end: false } /// , { end: false } @@ -299,14 +302,17 @@ app.get("/stream/:name", async function(req, res) { if (!Object.keys(listenerCounts).includes(name)) { listenerCounts[name] = 0; } + listenerCounts[name]++; console.log("Serving Stream " + name); if (!Object.keys(contentStreams).includes(name)) { let outputStream = tg.throttle(); + function replay() { + if(!isAnyoneListening(name)){return;} + playContent(name, outputStream, outputStream, replay); + } //var pass = new stream.PassThrough(); - playContent(name, outputStream, outputStream, function() { - playContent(name, outputStream, outputStream); - }); + playContent(name, outputStream, outputStream, replay); // FFmpeg chain /* pass.on("end", function() { From c6419fd3b859a06e4ebe30d59c1c9565817106e4 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Mon, 25 May 2020 19:46:23 +0000 Subject: [PATCH 19/29] Dynamic song indicator buggy --- final.js.tmp-browserify-73042202549475820916 | 0 public/openradio.js | 8 +++ server.js | 57 ++++++++++++++++--- sessions | Bin 12288 -> 12288 bytes views/index.html | 3 +- 5 files changed, 58 insertions(+), 10 deletions(-) delete mode 100644 final.js.tmp-browserify-73042202549475820916 diff --git a/final.js.tmp-browserify-73042202549475820916 b/final.js.tmp-browserify-73042202549475820916 deleted file mode 100644 index e69de29..0000000 diff --git a/public/openradio.js b/public/openradio.js index a22179c..f75f0d8 100644 --- a/public/openradio.js +++ b/public/openradio.js @@ -1,3 +1,9 @@ +const socket = io(); +var curItem = "Unknown"; +socket.on("itemchange", function(data){ + curItem = data.item; + $("#item-name-display").text(curItem); +}) function controllerclick(event) { console.log("Clicked"); console.log(event); @@ -19,6 +25,8 @@ function play(dest, elem) { //console.log(elem); //console.log(elem.parentElement.children[0]); let name = elem.parentElement.innerText; + socket.emit("movetoplaylist",{name: name}); + socket.emit("getcurrentitem",{}); $("#station-name-display").text(name); console.log("Station Name is " + name); } \ No newline at end of file diff --git a/server.js b/server.js index 0c40aba..13d4ec6 100644 --- a/server.js +++ b/server.js @@ -244,6 +244,30 @@ app.get("/", async (req, res) => { ...{ stations: output } }); }); +var idtoplaylist = []; +io.on("connection", function(socket) { + idtoplaylist[socket.id] = ""; + socket.on("movetoplaylist", function(data) { + try { + let socketsRooms = io.sockets.manager.roomClients[socket.id]; + for (var i = 0; i < socketsRooms.length; i++) { + socket.leave(socketsRooms[i]); + } + } catch (ex) {} + socket.join(data.name); + }); + socket.on("getcurrentitem", function(data) { + try { + socket.emit("itemchange", { + name: playlistToName[idtoplaylist[socket.id]] + }); + } catch (ex) {} + }); + socket.on("disconnect", function() { + delete idtoplaylist[socket.id]; + }); +}); +var playlistToName = {}; var ffmpeg = require("fluent-ffmpeg"); const PassThrough = require("stream").PassThrough; async function playContent(name, outputStream, realOutputStream, finish) { @@ -257,12 +281,16 @@ async function playContent(name, outputStream, realOutputStream, finish) { pos = streamsPos[name] % playlist.length; } let rawStream = retrieveStream(playlist[pos]["source"]); - rawStream.on("end", function() { + playlistToName[name] = playlist[pos]["name"]; + io.to(name).emit("itemchange", { name: name, item: playlist[pos]["name"] }); + /*rawStream.on("end", function() { //rawStream.unpipe(processer); - }); + });*/ let consumed = false; function replay() { - if(!isAnyoneListening(name)){return;} + if (!isAnyoneListening(name)) { + return; + } playContent(name, outputStream, outputStream, replay); } //console.log(outputStream); @@ -272,15 +300,17 @@ async function playContent(name, outputStream, realOutputStream, finish) { .audioCodec("libmp3lame") .audioBitrate(128) .format("mp3") - .on("error", err => console.error(err)) + //.on("error", err => console.error(err)) .on("end", function() { //console.warn("Unexpected end") consumed = true; /*this.unpipe(outputStream)*/ + processer = null; replay(); - }) //, { end: false } - - /// , { end: false } - .stream(outputStream, { end: false }); // Don't close stream to keep continous play + }) // For some reason we keep getting too much error listeners + .stream(outputStream, { end: false }) + .removeAllListeners("error"); // Don't close stream to keep continous play + console.log("end: " + processer.listenerCount("end")); + console.log("error: " + processer.listenerCount("error")); } const stream = require("stream"); const { ThrottleGroup, Throttle } = require("stream-throttle"); @@ -308,7 +338,9 @@ app.get("/stream/:name", async function(req, res) { if (!Object.keys(contentStreams).includes(name)) { let outputStream = tg.throttle(); function replay() { - if(!isAnyoneListening(name)){return;} + if (!isAnyoneListening(name)) { + return; + } playContent(name, outputStream, outputStream, replay); } //var pass = new stream.PassThrough(); @@ -330,6 +362,7 @@ app.get("/stream/:name", async function(req, res) { pass, { end: false } ); + contentStreams[name] = pass; pass.on("end", function() { //console.warn("PASS ENDED"); @@ -337,6 +370,8 @@ app.get("/stream/:name", async function(req, res) { outputStream.on("end", function() { console.log("End of rate-limited stream"); }); + console.log("pass end: " + pass.listenerCount("end")); + console.log("output end: " + outputStream.listenerCount("error")); } contentStreams[name].pipe( res, @@ -347,6 +382,9 @@ app.get("/stream/:name", async function(req, res) { listenerCounts[name]--; if (listenerCounts[name] <= 0) { delete listenerCounts[name]; + try { + delete playlistToName[name]; + } catch (ex) {} } }); //res.send(req.params.name); @@ -355,4 +393,5 @@ app.get("/stream/:name", async function(req, res) { const listener = http.listen(process.env.PORT, () => { console.log("Your app is listening on port " + listener.address().port); }); +process.on("warning", e => console.warn(e.stack)); //setInterval(function(){console.log(listenerCounts)},2500); diff --git a/sessions b/sessions index 0ed01f19f70edf40368c93f8c378141a0f7e22e2..797b50be74d585a1298074e9c5626ce5e05c3b40 100644 GIT binary patch delta 240 zcmZojXh@hK#l#jrQN{^KZcJFh&&AC9ihgw()!Np)E|^>=ufS$u00NU8D zUG +
{{{stations}}}
-

+

Song Indicator Coming Soon

From d1d6d25b917e989ede6b308093a590b2fddf5212 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sun, 31 May 2020 19:35:40 +0000 Subject: [PATCH 20/29] Stability Update --- public/openradio.js | 3 +++ sessions | Bin 12288 -> 12288 bytes views/index.html | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/openradio.js b/public/openradio.js index f75f0d8..940ce35 100644 --- a/public/openradio.js +++ b/public/openradio.js @@ -10,6 +10,9 @@ function controllerclick(event) { if (event.ctrlKey) { $("#streamelem").toggle(); } else { + let streamelem = document.getElementById("streamelem"); + streamelem.muted = !streamelem.muted; + $("#controller-icon").toggleClass("fa-play fa-pause"); } } $(function() { diff --git a/sessions b/sessions index 797b50be74d585a1298074e9c5626ce5e05c3b40..6c1b0a7cea31eaf389f4046d87edcf6e1f61ad3d 100644 GIT binary patch delta 144 zcmZojXh@hK&6qb)#+fm1W5PmyUVc9YM!q==d~-l>W8ocM7NE$c$?s%0GWtwjAg9Uv zf7gY{b@Hl{KgvmSni^Ue80%S>8c#khZy;o0Zfb09Vqj6rz`(GH)t9}AfAT$jg~{de oUA+9a7#R7tFz{~y!OemSwfyWrMLWmS$%*UHK1Z80N)2I2mk;8 delta 142 zcmZojXh@hK%@{vX#+fmGW5PmyUIqpRX5Lo}{C>Qz_~vXZyu-`VsMo_W`JL=WM!U%i zB@{U#7{E^xawQz^r@vN&qDuDBJ)5 diff --git a/views/index.html b/views/index.html index 43b2a02..0112646 100644 --- a/views/index.html +++ b/views/index.html @@ -12,7 +12,7 @@

Song Indicator Coming Soon

- +
No station From fdba79a26b4be236c27f417834419000a956b6ee Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Fri, 19 Jun 2020 19:26:08 +0000 Subject: [PATCH 21/29] Update my db --- server.js | 4 ++-- sessions | Bin 12288 -> 12288 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 13d4ec6..c025500 100644 --- a/server.js +++ b/server.js @@ -167,7 +167,7 @@ app.post("/edit_playlists", async function(req, res) { } else { res.send("Please log in"); } - res.redirect("/edit_playlists"); + //res.redirect("/edit_playlists"); }); app.post("/delete_playlist_item/:name", async function(req, res) { if (req.session.logintime) { @@ -192,7 +192,7 @@ app.post("/delete_playlist_item/:name", async function(req, res) { } else { res.send("Please log in"); } - res.redirect("/edit_playlists"); + //res.redirect("/edit_playlists"); }); app.get("/delete_playlist/:name", async function(req, res) { if (req.session.logintime) { diff --git a/sessions b/sessions index 6c1b0a7cea31eaf389f4046d87edcf6e1f61ad3d..25904162c0226a3470197a68562d84dd9ccce929 100644 GIT binary patch delta 206 zcmZojXh@hK&3JvHj5Fi)jR_0+c^McO82SAf`2G3j@Xgs+c!ziLE7?sfK*5yB3*^@8 zH|k}u`m#6iyX8mZhQzxXrdU`Sx+fdBWhI-trxquc=^AAPyXd-RJC*CbbF5^TTqmzO z`JW8od%$**KLu{7%S_)K0Pw_cxt zVH2w_dlSE>dr7&0slR)Lcb;>xUrw;8MQBp8sYPT#NvKPTN1(S;xmwX~u?>^! zCOgQ9@)?8}8CV$@SQ(n>85x^SJ}$2(X<%q+W@>0)YHnJ~#ea)|k$(#V{}vG3ET~Y+ bKe=09lSP%;mud12ePvY!1~o! Date: Tue, 23 Jun 2020 17:59:10 +0000 Subject: [PATCH 22/29] Added ButterChurn(milkdrop webgl) --- README.md | 31 +++++++++++++++++++++++++++++-- package.json | 1 + public/modulescript.js | 31 ++++++++++++++++++++++++++----- sessions | Bin 12288 -> 12288 bytes views/layouts/main.html | 2 +- 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d4f7290..b83587c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,29 @@ -# Hey there -This is a project based on the starter node template but it includes libraries to store user data, maintain sessions, and make all your pages use a template. Enjoy! \ No newline at end of file +Project URL: https://frill-corn.glitch.me + +OpenRadio is a system where the admin can create multiple radio stations for users to listen into by inputing youtube urls(defintley going to expand). Everyone listening to hte radio station should be at approximatley the same time as everyone else(last test resulted in 1 to 3 second difference). It comes with a nice admin panel that you can configure the password in. It's also open-source on github(I wouldn't call it openradio if it wasn't) at https://github.com/javaarchive/OpenRadio/tree/glitch +You can create a new project from github and configure these values in .env and your OpenRadio instance should be setup. Feel free to delete coding playlist and testing playlist. Make sure to set these values in .env +![image|515x500](upload://5xXblWOJMI3B3Z56OzeIlgOuKW2.png) +You don't need to set `MADE_WITH` but `PASSWORD` is the admin password and `SECRET` is your secret for session cookies. There's also a whole lot more config in `config.js` +There are a few annoying bugs and issues which I have described in my latest release: https://github.com/javaarchive/OpenRadio/releases/tag/V2.0.0 + +The system is designed to use infinite mp3 streams so you can have your devices stream https://yourglitchurl/stream/(stream name here) +I use this technique for my google home and my amazon alexa. You can also setup discord bots to stream from it by copying a bit of code from discordjs's documentation. + +# Inspiration + +I think I got inspiration when Ben or Electric Reality on discord sent a idea for a service that gives you music streams. Using python this wasn't really possible but with nodejs streams and rate-limiting this was made possible! + +# Screenshots + +![image|690x348](upload://sbgT6fDQYyrtiF48Pzbee7BGljE.png) +Control click play button to show audio element +![image|690x224](upload://fpxSIOrR6jevQRTsSgulBPyxf59.png) +![image|690x187](upload://gHTqLip8ht6pg92zrm1El5yvtgm.png) +![image|690x184](upload://sVFESkrpwMiYsiaFh2TZeWavZfN.png) +pretty proud of this screen +![image|690x401](upload://b5qgTymjw0M3MNLKxFm61232FXy.png) +![image|690x248](upload://9wln6wcOcOoR9MpjvGBFsluCSf3.png) + +# Customization + +This is very customizable as all the templates are in one directory I think. There is also a template that "wraps" on top of the other templates which includes the topbar. diff --git a/package.json b/package.json index 4624ed9..46556f9 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "//1": "OpenRadio", "//2": "https://docs.npmjs.com/files/package.json", "//3": "updating this file will download and update your packages", + "info":"Type here to reinstall modules in glitch", "name": "hello-empowered-express", "version": "0.0.1", "description": "A simple Node app built on Express, instantly up and running.", diff --git a/public/modulescript.js b/public/modulescript.js index 853492e..923a876 100644 --- a/public/modulescript.js +++ b/public/modulescript.js @@ -1,10 +1,12 @@ // ButterChurn // My failed attempt - +var currentPreset = 0; function enableButterchurn() { let audioContext = new AudioContext(); let canvas = document.createElement("canvas"); + canvas.height = 600; + canvas.width = 800; document.body.appendChild(canvas); let audio = document.getElementById("streamelem"); const gainNode = new AnalyserNode(audioContext, { @@ -27,15 +29,18 @@ function enableButterchurn() { console.log("No errors I guess"); // get audioNode from audio source or microphone - visualizer.connectAudio(src); + visualizer.connectAudio(gainNode); // load a preset - const presets = butterchurnPresets.getPresets(); + const presets_obj = butterchurnPresets.getPresets(); + const presets = Object.values(presets_obj); const preset = presets["Flexi, martin + geiss - dedicated to the sherwin maxawow"]; - - visualizer.loadPreset(preset, 0.0); // 2nd argument is the number of seconds to blend presets +//const chosenPresets = ["Flexi, martin + geiss - dedicated to the sherwin maxawow","$$$ Royal - Mashup (431)","$$$ Royal - Mashup (220)"] + + visualizer.loadPreset(presets[0], 2); // 2nd argument is the number of seconds to blend presets + // resize visualizer @@ -44,7 +49,23 @@ console.log("No errors I guess"); // render a frame visualizer.render(); + window.render = function(){ + visualizer.render(); + window.requestAnimationFrame(window.render); + } + window.document.body.addEventListener("keyup", function(e){ + console.info(e.keyCode); + if(e.keyCode == 37){ + currentPreset = (currentPreset + presets.length - 1) % presets.length; + visualizer.loadPreset(presets[currentPreset], 2); + }else if(e.keyCode == 39){ + currentPreset = (currentPreset + presets.length + 1) % presets.length; + visualizer.loadPreset(presets[currentPreset], 2); + } + }) + window.render(); } + var khistory = ""; function KeyPress(e) { var keynum; diff --git a/sessions b/sessions index 25904162c0226a3470197a68562d84dd9ccce929..dd115d423b164b7ca50dd3857962188430f37005 100644 GIT binary patch delta 195 zcmZojXh@hK#l)U8QN{^KZcJFh&&9+ymx14(Z!X`QjfHo3C%=;2Y|yCJSj_6n-o&4o zR#4`dTH;m~Y3ON~=bGk~Rpp!R7U1vcmX=)<;GN=BZjdIBkubSVUSYD8oP?m6uCYOg zp}Cc*g_VJYp1HZnOoS|B_&oWxzA6A+?LA-s delta 190 zcmZojXh@hK#l&`fqKp%e+?cS0pNo;-pMl?>Zw}v_jfHo3C%=;2tk1xh!s^T3#GhF1 zZf+1*Qd*o@5RjUiXI^6Do?BY#7i3!QWsvUSYUot1F7|)dg~@gDR{RErA%>P#riNAq z#(EZ}#*>fB>+u*ET9}&}o0}L|)G|!=m){Ds>ox=bZT>C%TQ&
{{{body}}}
From 89840d40b25fccddeb26524eaaee9bd001e5014f Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Wed, 24 Jun 2020 03:25:04 +0000 Subject: [PATCH 23/29] add web app icons --- .wget-hsts | 4 +++ public/android-icon-144x144.png | Bin 0 -> 5248 bytes public/android-icon-192x192.png | Bin 0 -> 5953 bytes public/android-icon-36x36.png | Bin 0 -> 1981 bytes public/android-icon-48x48.png | Bin 0 -> 1954 bytes public/android-icon-72x72.png | Bin 0 -> 2619 bytes public/android-icon-96x96.png | Bin 0 -> 3353 bytes public/apple-icon-114x114.png | Bin 0 -> 4116 bytes public/apple-icon-120x120.png | Bin 0 -> 4295 bytes public/apple-icon-144x144.png | Bin 0 -> 5248 bytes public/apple-icon-152x152.png | Bin 0 -> 5521 bytes public/apple-icon-180x180.png | Bin 0 -> 6786 bytes public/apple-icon-57x57.png | Bin 0 -> 2156 bytes public/apple-icon-60x60.png | Bin 0 -> 2251 bytes public/apple-icon-72x72.png | Bin 0 -> 2619 bytes public/apple-icon-76x76.png | Bin 0 -> 2710 bytes public/apple-icon-precomposed.png | Bin 0 -> 6527 bytes public/apple-icon.png | Bin 0 -> 6527 bytes public/browserconfig.xml | 2 ++ public/favicon-16x16.png | Bin 0 -> 1281 bytes public/favicon-32x32.png | Bin 0 -> 1779 bytes public/favicon-96x96.png | Bin 0 -> 3353 bytes public/favicon.ico | Bin 0 -> 1150 bytes public/icons.zip | Bin 0 -> 102418 bytes public/manifest.json | 41 ++++++++++++++++++++++++++++++ public/modulescript.js | 2 +- public/ms-icon-144x144.png | Bin 0 -> 5248 bytes public/ms-icon-150x150.png | Bin 0 -> 5356 bytes public/ms-icon-310x310.png | Bin 0 -> 13897 bytes public/ms-icon-70x70.png | Bin 0 -> 2517 bytes public/style.css | 4 +++ server.js | 4 +++ sessions | Bin 12288 -> 12288 bytes views/layouts/main.html | 22 +++++++++++++++- views/playlist_editor.html | 2 +- 35 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 .wget-hsts create mode 100644 public/android-icon-144x144.png create mode 100644 public/android-icon-192x192.png create mode 100644 public/android-icon-36x36.png create mode 100644 public/android-icon-48x48.png create mode 100644 public/android-icon-72x72.png create mode 100644 public/android-icon-96x96.png create mode 100644 public/apple-icon-114x114.png create mode 100644 public/apple-icon-120x120.png create mode 100644 public/apple-icon-144x144.png create mode 100644 public/apple-icon-152x152.png create mode 100644 public/apple-icon-180x180.png create mode 100644 public/apple-icon-57x57.png create mode 100644 public/apple-icon-60x60.png create mode 100644 public/apple-icon-72x72.png create mode 100644 public/apple-icon-76x76.png create mode 100644 public/apple-icon-precomposed.png create mode 100644 public/apple-icon.png create mode 100644 public/browserconfig.xml create mode 100644 public/favicon-16x16.png create mode 100644 public/favicon-32x32.png create mode 100644 public/favicon-96x96.png create mode 100644 public/favicon.ico create mode 100644 public/icons.zip create mode 100644 public/manifest.json create mode 100644 public/ms-icon-144x144.png create mode 100644 public/ms-icon-150x150.png create mode 100644 public/ms-icon-310x310.png create mode 100644 public/ms-icon-70x70.png diff --git a/.wget-hsts b/.wget-hsts new file mode 100644 index 0000000..34e95c9 --- /dev/null +++ b/.wget-hsts @@ -0,0 +1,4 @@ +# HSTS 1.0 Known Hosts database for GNU Wget. +# Edit at your own risk. +# [:] +send.firefox.com 0 1 1592965437 31536000 diff --git a/public/android-icon-144x144.png b/public/android-icon-144x144.png new file mode 100644 index 0000000000000000000000000000000000000000..be8ca756c03e70ffd6616d59949f20a2ccdfca6c GIT binary patch literal 5248 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 literal 0 HcmV?d00001 diff --git a/public/android-icon-72x72.png b/public/android-icon-72x72.png new file mode 100644 index 0000000000000000000000000000000000000000..48282e0bcb5ac40b77665f834a1b8315a07e6117 GIT binary patch literal 2619 zcmZ{mcUaR&8pnSjB!K`IL0tMJR9Q+IkU)qufdna1B27>rjnIWi5rjk*Ton{t#D*9U zVF5vkC}JU=QV#*?3n~FoK#GWRMk!v{=bq=heV%*fnR#dC{k-3I${#bQJUu81aCJBU z017TtM{kLxZdVzoq&=|INRb$6w!OPO0Mwt8+X#h7#-IdmiUUyFt2r+jpy*U@cK|qM z006vS0N|TsiZ=%UN3j6#J_G|XF+1fmZU3mL zZBbRtmHDdLi9LH>)l_B-T<+q&YPpwwbou^lacaBZz_^Y221|@Ys7m!hZ~fv6#VRZU z20BaRk=#3sG3PVFOLoXO=@l(exDet2dOQVQRca?fqQLE&>l<=nGtbqj`l7l*gl9O8 z0-gm%r6{1Mc700A50S}oV_>rM1}qtDh=Kk74h(KZ9(JZ5CXCer=LMeZh9%77z zZnS-`GO)<8Nv>I8 z?6qN8J1DDH>?WEO`tf!x87SSz$`hbxgKY&n+-$K@FEgLvTfP|Sx;73xd=2&eYO679 zEJW~C79h046>{{e)_hmqPV=c8(0Aw|*w(MNNSsyP1>qW1ei&8+QhqOOE+4d*d8N9d z1C7PvPc3@F)ABjI}J~V^+c>q z0s>=xDt}nLCP<_vN(}ij)kchaJg5%&IF`O3o1FwRm1?{My-V*r%+XX&}h57ag!m z+E>Bfn=Z8}F28Id8E^1oI&fR-5 zXF|v2b}z0o8ETlwJMST9VLf`b1q`iOU~*_qM1S@{GaPx@$V&K=C^$C~mfwGqIDf*@ z&N!c$aKRa7oiBZiZFr}Y$fNW(mfFu?wG%DmKw0a>jXOGu-lcBwEkB-e%3P49nsv@o zoNlyT%rgnUwdj;u)YO^1-1sx`+TI>Stnf_v%ou?$+FT9b(@@RO#t?HEY@LhY+rMsYY7d|T~hoF1j##(p|!srre~&}F>A{e z9_h5Ylr?jzmB-NdWLmMa3Q=FY>&5N{BZF*qh+mZa?Jcv@KtC2AJk3m=x%Q9x^2lgz z!ZJIoc5YSst)R(Qd4A!H2|UJ~IY9j5WP@^>H|RmoCuwqF@qEUJ?oGp{p&B;}&!;^j zf_xi)gMd!%;ka;4GPFE$iu)XQ{q|6UpmZ{wsVNX-GS)xIcSBBo-5@9GSB{+8nSXB# zt?#@w9TM3RpkaCO($L97tJ4k2F{?&9v|Kw}2EY8?{BhLlcH>4{`13+`@=Q13)!-}A z8{!*u1k2us(j9La?}1i0=g_-SUD^eB%09Xldxg~7LwC}HDvSy` zruF{*8jcoSHYW_A7DUWFM^$v!^hxLw{TCkTV0*l6v>Y%W}M>9lh`-tS#;GV^f# z3wsSettDp<#-ZGGJTOF?d~tTuAMD*Z-$AFob@?naU$@xVX0gDEXI`C-dj5P1dtPzu zMLEnPC|^Oik`tguSpxR!G>!CqjVmg<3li+l2j6RyQ5rjQ3>z$$`k005{FzE<(BhFp zkgMm<;3k)idw=?HEfBZ1pB%(+L5><{1Q4YrD8Vy&sNyo%+Y_Ji2jAw*zFSfx#aj6Z zGpQwQO*9qX=!NTZ>(P^p4?PpawUMLr1TSXVYI^(U?&7KEL(P8T)}5v_hP~=uBQinP zNgnwvBUN^+%FW`9MIPdG?`7Gt6^{O}@eR;om-T&}Y4-Hzr13jFtqJtQb=b5VWh{Az z+86V>B*mU=;F0VGPdrZ#dEgOR8)v5EX`1K^%gX?%MsiWlc{2+roZ^ui4Z3H$o#2X9 z$^mz;LkT(;kmyj}eYGxkBK^UD*FfT3n=+}mMnt$$WmgKKG8Mgf4)SYY)ji7z`z^0$ zjvGT{(WdQ*u7aO^%H1yGncaWw9KEz9M|*4_)fyxf(P1Q#V=Vn>G&6=vB6&*C1OQj@{Q>4L%%3?)q;MvO9nJ-CR(J#u zpCw^be$e?32xKXie3@bE| zLywI~!2I`OFbui{lWs;d!-dkBj8GzhXdcG2G-F{2EG#aJVZ}sCBG8icAr(x|NiqN~ MP9Bc64k0K04eljh`~Uy| literal 0 HcmV?d00001 diff --git a/public/android-icon-96x96.png b/public/android-icon-96x96.png new file mode 100644 index 0000000000000000000000000000000000000000..9fd6997940ba127e0a65ab425c3ae98ab73fc621 GIT binary patch literal 3353 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 HPttz@g|x~T literal 0 HcmV?d00001 diff --git a/public/apple-icon-114x114.png b/public/apple-icon-114x114.png new file mode 100644 index 0000000000000000000000000000000000000000..80a204d3332be36e71bd6075b0fdfa66ac9526c7 GIT binary patch literal 4116 zcmbW4c{J4D-@rfirDV^(4Q0qOGnQepj=>;V8v7E)7|Jpj3W*V#Au-Y-OVL;>p{T5r z#Hd6F*%P6%CTn=6?|II7zR&NR=bz_u&-=d5z3NTx>rBNkof zjhJ;@wL+OeLB(0r;2T6D>WbNrX_KsXW z#d&$i5zPL^wKyqpnl-J2OjhAFhk%86&wy->%9{!?bmQzcbe=T!Ywgv0mqs2q zd1>{J|Js?@Y@Hi>I^Li5GPzDFAl96Pi#1-b${na@J3a2=BHO>@#+7t#6Oi;fyB3=` zakr+2%bBf{6*2SYIWWml|EWor;}piQ{}nA-gK9+LMYG-7{AEaYOI&QOB1sc?t08U5 z8La%Qjpvs-uh2udb0zPTMo@|36$O_5b?mBB@>7?lK5@sC0m=i{3@I@K)@wKD@!TX$ zMOtX?m*x=V`bhGaONwkNdg2THC0%Ga=3Sh&lw`u>7~9y9;I+bo#?5(gzClgmI4+5b@6}l7ov3k6E?0UjmV83=Et4LPG z)^6~W_VRWHJ&OEnpKJJ26-zxoC?jafzTJMCoxll7xe_AdLC8rgpxe+d2#7Y#-E{F# z%3W0KQ(ldt-=y>UKq0;L&^K2&3t6gI_Svt=_f>e92K=C`Z?=p0#b4&5woTm1JQfp( zdJ}5K_@e--u)Y0$P|z)8V3_`c+2yV;Jj*p5F9=FVET1T~4meLQ3VHHc=bNQ@N2_?XSBWu=8E}P?P8uFF_UgeV;uARbn)^7cW(XX(KEaug+;pZ9rPaC_a(Blyx;r9GA|X5BY86bI+U63yw3 z)8pU_@k6ta;boFXmZzU|ppUr2_SK6CCzOh{HEZG&?dh!klhXc+sm&&Ss=B#`eaba* z;m4d~;d6R_h-X|ys3JGg^#&)|_GdF2j5}SywaXalLwH=>c77g}c}>Ua98pQ0N`j!6AcP1A;LD zv;y_v{s<0#s-asg{bHbTP@OLRCHqU1;5{_8!zj7E2e9mHDn4Yu?#VZ1bLqDPhg5TC z?DAaE#GhNoh^+(n z^W=Dxz!pSE&gckFaJy684^mi6q-?s@&) zDvk`t{G^g0fwYJ)&|C91KKfZ`8AzoZOKuS#WSa!`t>V=B^@b@ZeAV&G$rW6bSTB~Q zdgRv>BmuOSj?V%!sHjOrYqI$kyZz6LL64G+2Mfq=Vnnm6(#!%l!$*$_L$66(W1JIm zVO>^?<$Y_4Vf2uO_s@7#uib$a;kueQKf}LfG8H8!hq zr=KS%LHoEPu`a#5uY9{5v?4Mc7sXG(F+43uQd9vf2Aq6Ks@Hd;OI|3~VvVvb&L+(f zY69aOH!tQFbExsiQnStXd4-&5!cR3vM1yeVhgt4fUMc_+vPM31qcOCT3h7UQv9w@? z60(am+cK9?G8!+hosB-!bxY26JyLvBFg-Lr<@3a2LKa6Ob^ho}4(V%K-&M5jDgvLwF39n{W4AMT1~eeiUmw@GD3q1{es zloD!G552Xj(9TF_O_82AyqXv3Ubgjkm zyX!+W^vSMIu-e06@f4B4y3HPkk^CHJsyO@rTY4PjMRq~w>^@h5_qEb4G+pqm^dGGk z)?dB^E0*97T<>tF{4_^~JM=*%R|_uljit>Vy?Su+@B};j$#r4zyTV|X?6d6oRW}2^ zq#qKy*;hjHYiMWu5ls8MQ2nKF8$I#d*XMpVLwm)W_7-7%s*aq0ueBauJ6BWEqfzhq zu6sJFUEEvCUFT{jXz)gd0Rg%aMDx$abRG9PMXmExfoKq9r-6 z=bId0XC(Skv~!8a(=fUyN4#+fmV~}u*p2~L?WsI)%;=e zTb#b*peskos~VZ(5yEO0gIKB-byFBh?j&2*ADkQCmfWkc`&MW}JK5IKvV821UxmhP zaqa3$iz3pg`Ei~`{rS)O0!!lK%d#iElF^gDxkDbS4&RhpXuS})+pF@{2@j16?zLz* z>1`rLTw579x2@#vC3Mr7mZp+ZZx41X5s6mW)(Lj{BMk~(a}D~LZ8%_@-RSDEBvJKP zO6R1i97u*0ld`PiLN&j%)Zmfhe0QCAH>Q!3`Hx=QGCM#U$773j+2D_kf`vb4=C_vr zydueM{ZQ8D^E`cP3KMq!k*&UAzh$FG`J2x0t)ll0)t>3=M9G{0{|Rsjk*87Qt+vYK zL$~Lz*3yI8-{$xSaOc#;*Jmks9o9BU5efG~H?2`m(@EsUK|)@ywbr>c_E4(4x%R3Y;(UXbQKe~XN(rbgw44dZ2&J?iooZ~XrK3D~4m7#(4@Hh4D zUZcJsV^e68mDh(PDQycgMQ!To_BQm?fZJ^AqS%T{@Qe!FbG?h5eM8E+_*EbCI>eWJ4|5Nh^0E#K$-#e2z&!P{yL&!UYB(}&ZDo-MKq zPLLBLvzDqRQC2A?Ppgk^8L{l%SN>|L$}KVRF>#b*n?Wn0n$_lIeT@N8ShNG0t$z{R zJx{0&MMhuQwRBTT(YemEa&txMu$_G8;U%-Xhq#tZF*g2!6nS=y*VQuVr16;A6#BTk zNT0-vpATQ3OhgsvZQH#L%>x(45M(?N6_$p+J>T0YaDt+yuz377%QA?uU!ncBZa(*Y zwrXh`N-dT8D*+CDPC4u{NBiU-tr|HuFVFvV({3_N`dS9=)sWCO;7DsqlSjo;W^4W= z*Gt=!q!;lHyjHF~$=?H9V3nhVYwd=YywqxiUsx<;i#BqvtUo=|?*39kIZ4bR^O1dJ zTitlG@b+rd%a1LJ;0{Ewk=W{Cf_ip=9>4xBRQNdQRHUx1m3 zo$6!R=Q43wgl5i$qN-2klE$8kd+{2-ZD72NqM?wgSwsWRM8pc=DiU?^d)sH%ef)hwdLu;5D)F( zy(S3>PnjPvyuGD>7&Sj(czwM;h8*w3+ZmT*)pR60*0$Gxd9Zev^XIzfMTBMyg;fkR zuqUVSi>QsOaRNef4F|*FXxOd;O7(ExR?$OS^!m4B%Z5+bSw@MU z3<86wLv+<)+87870fQm5bWcDa2nfVv=xopbatI0Y4+@C+za5}ybAMle7JoBDh6NBW z_(tFWs}Ns2&ej(nggq~>s{z;0Q`eV=L7>{|5FK?WOx^*iD<4QC5)hi27cN}T2>MGi zg-L6KMc~I$7nuP8@xKuuP`ESN0$e$Sa7wLbbz|BM?{)N~Eh2V%W1RU^BRhooQym77b>Hmmh zi(yg#R7W4CudAb_quW4T8)72-|B7=aC>94mkjR{3qn}KZ^S?|^j#fZGP%w_!zGg@$ zF*ppb8Q>cogbfRg)cl`=(e%ga;ILY7EvPRR=kE*Gg=_oa^t1vXx&aWVpT9m%gXy8c VtWSs{$}nUcXrM`vwJ@0IlHreZK9>QAqz7vGXMZA#zy+q zG!6L^j106{%|+!CP3UntW;y`SkOn<;hS1g^e``Zspmvb|J8dD1F|sxTfG}|Yh>in* z-?XjhZvYU80DvF20YE()0JsVH?N%DJ1OwXCP#-w?Gm1MaGHE+Z1S30tni~BRmj^tx z0Dx89SYPK_$mfj$_jJecz`m%xPN$0Uk>2y^bp5x{vOFE=Ovttf=(P*-u{6iJ-|LIL z$dzo=qMokx;|SAoIxfjrcCyMji3?b3rhY7A(0g`bZ-=<7c44gn7r4kl$HrsAn zz=mwMA!89|x507$qpnV5@#&Dr?ru&hP=Aj^ry3naf80slgJqwx*X+ItMyGWVq4!b- zLsba^^*K%=^7OTI(o$V;`YzC6@me-RHdqiiu3p=N@(nREYqitKbG9%$GC9WiYzi*e z-xlpuoza^p$U4LLd(#R`RiG4Yki$SBXHX3!tIPW9e|Z#LI^6=Q0|f!y&_n+A0mzua z>YR}#Ea(8TpcBHeM9| z`VjmgjCz(5Ow<<6&^w<%Fw#v+%6xf>Doimaan*?>-(()`s^v@93u2@)^A;t9u~*-% znbf;UVIg*;w=G}3&tJ#UpR1klRxpW+?bd>M>pGYltV)MBNF7IEVlYOeA%zPW2@(Xu zDR#f7gZfKd)~P<$bL@2{-ncxa@!-ZB3g0M|#nPpnA ziO!380?H(bZX%WPz!Xk`3;|IgBMBlyYD-3MCsmrxrLT3eKZ~4AjwaJdgitTlo?pfF z2>7bDSo~I4uozyqkb0BBC)pqb1acZ~>Mc*o{`maWzk?OUjjE2s%jSOkjo23QAPH5g z#t4-i20q$)Z${F9qdZc``lBAJbaj_u=~)1km4bXE$r#=DZHQrId}-V$t>xBPgE3-I zOWoQFqi^i{=Zwy_(eFz@lmv^!B`Rcupc5%M`b)=xCL>re`eQySpVG7wd4H|`;cn;t zwkC1Kt$$yD^T)~nh;;o6%as-1lxcXIKUmxn`laB_z4*$oC47v02A(?~mP{XVdMcH7 z_8_`wVC!N~Svb|89apT7Zo{n^(>uHIl+5J>?1~~+N0er?lo;yfpN8&qdi29sI1Dq& zN4hqDTA6FE<-gR~qpZf9T=E~tVarZUU71L4J*?<2F|EL$sCb z9qwEab(0{|Li%~&P=sO{{bV9(G;pNxQ08-;Z098osyeTKtTLu^E?{u~OfJLW>8if> zCR`z!_RlkNUFfR0xH1$2MW)+J#ovo+e~fmuj=yY3T8-}P&;2R+Q3|Nj-3pf0OOmgD z3kTJKj~QPm7|no{EH{6_I9Y4V);2D$3SIY}O{`L36~)QIxthb4?awF3h#1pLi{gH` zlGG-x3wJaqnhWw)Zc3Tks4_!CQl-Z-)a9p4Desnmq(tFV@xzD(>xHzKTVgXG-rrfM zOJ6AzoVJvN7kH{A#TVH%vgk1U$|6e`%-L(ij4OK?uBf=fRhQIAzl#KAoIAeTZi~99 zd1N)0f#fdfVU)io*udIG$*uh=g>jWjCpx94$3r;iwDmnxezwiS&Rh^kShgjM#mb2~ zNXvPQ>@{Yw^G-8b*&M+eEd=xL`mtsjYc;*?6GYl+c{tD%nYr`n#6DS;pNny*O~%f9#d^fAz0X*UA2k~=9g zD(Q#H+Cp6%9wUkQYS%lORu;$YRV(BV`(D^|DxK))YG3tf+!UZQ339w^5|55@mv5YB zy0B^HrYqt-xF6d5vgZU?vvIr`EP$mHim*v2e(iMp5G!HzmE_9FTV4Rqr7P6WTv}}B zYJHPT?6V3}=?|(5(%^qHVt?iJ24>=ZMjx4R)}1A9_}XolZ(im7&A$G-PQm(rmHM_?dvSKYFdWK9y$q~!Nl}Ik zcPCCiFv+a2eD}SvQ>PnZIDTl?o_>ZZ?pNzN(e$hIAe4zvpd2(x8W=$Pb_Il1Pi^zA zh%55p7(3ruVR%>y8on+cK)N``?aB)*-AXo&H|aN5t29$;vrZFx_(wOCys2;sSP0B^g$^riXBSLgM^ zP>VwC#e4Jjh<{sE2Fg_ts5VOUV^%>Gh1=nmvuYV4SU<0NmY!(-vM+e`Lt{Kg`krgd zjRu2k9}TCBJ2CL@nC3GmCpTDxHl+?SfA@7Kbhyn|lj5+krv*CPuk9SQcu>L>UKy|p zc02kMYri#Y`{Sj03Ac4#?OEQxXW!nA7)2_9eiF3`8?+j8Lx%Ex?1%8AS%77;wY!)+61XJqGMyKWx%8}B1KunT!73| zNjS!K?3#~~-RpdR@8vmNa_=$6A7hne*~LPxoT*CYG%cqE%hC>=>3_-dHqoEXzH2MO=KE zx>gc6aM8}$XKL+tl%mO1@viBKCR@yNv&qU2y*@$?BZ80dx10B3&2`TzPuU*5c*joF z$vyL&{xw+4GV7?;=NATN7&i22Sh^+qvxeEXdz|(S;Z!>2l2R6n-WX1Ir=OoraV&_e z%?&X3X0-HHB@9Dz>IO%oF9=%e^~zr{G4fzj_xqZqc}b2g*%$ejh(er0Rv9t%0yW0s zl~XU2K_-SHgsZ;Sx=;og>SwKGs&1Mpc+#|9VTd(72~22U(55(#-OUuiWDs>-56Zr}J}(~MvfZ41ce5sl->Yokj>Jx*t-6IuWL)-= zZY`ZeYJDSYs*bxfvZ^~KXd|Ny$<4U~o!uH_Uw{a%gx%9!kg!X&GEg2(D|xpl$3RAa zBZT0#O>TV$;Ul};DHo~@enajEZj|{VeJ90vOiQl2j1CMu4K&EJlG-@CQ=Bp}jK>_G zW9O8&#ULl>#diuJ2k4nT<$i0t_X&Pjk>8rDHW2ESfotKRLU+7+bl6`!oFP)58s)i- zgx?LhE&%7qt?(S>X#H@d@Hl9ajI*kn;A?qiyE^_w;6$i#fjTYg>BeQ>^BjJ)DaB9J z9p*JFe#i!DEs=Ql_7%6`1LanqFyG}!w^MQ7es%8zzmwwL;)3xnEP@l)%5=3gKFO*I zA|@Prm?5}igxmzw{?k5o%q)sta}Y08)LV+&&3l0+S<)=u|Mcr^l+v_q5<~aeW`TE&@GSC@9!YGTVO?mFbEVR8Qdi_tn0I(Z#qj9+ zmWJW*b*JD%l;5RIQ62N~j8qK?KG%_Kf3eTZ=Sx#}O6BDQpG3e-4JXe}(UN$8)6?N|#8C&a4r zvnIS*B%uD^G9h`w<~p;24pNLBpnWIB0t{>eT$}^2>KH#PO#lUi0s@Xufh#CoLnx># zD5xu{$RH5v2*jnyTSNb=z#H%4?i%`k7a)^X|9o06|LNe5cMS-3_QL|k-p)9znKRBE z<0-5nrz(ens|hP0kVc+oP*R72KS9dQg?fUZGJ^@~MoV=@ZkUIwN z<1ha|4<{I(c7Jzb=SJ*{@1$S?t1sLpSAb%d&;|Z`LN?rH<1iE$3P!5q%NTT6VG?@fZySUnF#<8ED8YNqX2+o z@)Ujz0PuqW0PA)D0Q?C6z~NcYVX96xfbETt2*AakucWIwgFHj)dBe(wtZ)1y*FQYe z1OS+K4G=o!fzz9XCmAB&tln$Qg~}*2DKx#6X(D(J3SNqY2-6wxN9tGzj>Lh@>}VFD z_v6^ZUo;PB5gJc{Cbixl8FYjVs2K9>=-0I=bRg`si%}t#Js8;+kWMv)kovjjTDV)) z#N3%8&9kDJf`i+BuGyIV0?j#6SkY=IxlKEm=jKy$Qq$pccII^FIXnGh&d#m7M1RC{ zKN5c2A`Z|3z2c^k5BnT8&lka0dt%e+zkiZsiFKfLuCz-a1QA;AgoUuQQB7eM)HkU7 zL4!;LkRhRo@I&f+9DHeP8&Y%UT994ByRrf>jwSG?0#t4Q1Ak1E8gyf+y_@_CStpIhLGnz_8-f=W&SBqQ3Ch8^aj{-6hTgq4cXib{ndk z4y94gzU5NX1I_^|9JaL|9hnk3KeBjczN^##&Vq4#wi)nk(S+i6chgr+v== zr_$Rt&LWEAKi>`!YzP7AH2_9n0L6vD;{Ngq*!afVwVqEpGH3-)c28B7QJ4bgUOZw^ zU=r*JWEl;>hn{Knk8?hPWLg$UuyLk>v|?*NvB4$+-LBCm#6BfR5sHB%%C9A=^SpqE z*V-r^2dX>T)@zsL>I2uTeru_0vEP|Dm}i{lWz!lrT`&15$mPqS6k~kyk)TLGyk@Fl zV#5beD3|81Lg&%*UToZZS#O%O<7e_HWx!!fhXC&f<;Gn*)|B1!r;6Kbji}Hj#9sm> z6L+#>rHPe^GEYq=aDF8@d>4W-H+iE#+e^#OzZ6oS=RKl6kHjC0cA7^4KOt8SG*?y*K(-7uovS^Mza1$x599$g8Bf*WrLCHs z^ska!5xkNrVZ2s_Q*?JwxZygr&(un#YOiyR(h@a6Rxz8tB*8lynD{@7Zx3 zE)h8Ml(zbvJj$;zg}lp8;EmV9Bjg)3;SnJy^=mXprx1cc7#=Y3C(@RIc_YO^)Ex zFTawWC{f1!@OF;oD0NtYifBQ84qlpM?oX8&CzdMz;aM+LAxdA)IBKg#gHRn2F60in zieGtpIWHBtDpFsSgFi7H+K(lqmi>T5oE?g%*1vJe6m2NtUXOtc0)K+SsHjqv4z(Oz z7&A6ng5###81e$Mo6L-3BamDqjM`J+SM7jSzQPFm=jw2*g%8@Fl6<(lnp;+!<~bT( z;zDT;S*C$ptIEe;jkD6<610@hajKF?Up?&^6#Cd}9=)!93bmf@ZGL@HT4Na6Q)>`WOp+{}{-9x&PrS zVy7wT*Da8kW#EIq-tDr_C;k>!Bq> z|IH-gk9-2Czi|>}?AT=D$ny~a$7kJI4UtHfXzo0q+2-`wg+Pl7AK$!ZIr|pJ`t;gQ{*$Ky^-sc?+?LMZ z0~x~`JM3T#gO;t_w+2ctD?=tDBuj3Tn|M3;B_(d)w*WQzmEMorXyk7 z!lVc&8Q&Wzbivgm+dqh6iRp~M7W}Zz3ADO^8#oju%Mf{{>3k{XFNTvV z+b(bNzN4+tU$Qr%=G~=pt%W=9Xeje``uB0{@vjR6KmJw+Ep$lx_PrleOTPL}@;!9a zAdjqy?{YoQt7MgC5v@tr)80KxQcHxE2f*;ysAk@8HZ_)d^$_rSV&ZZpW zE*GA-=3g4Gf3)QVNkbnBvzSUwdm&fLYnzh&jXD7D6^ZiH_N!8yy~t}nQ%pEjbQh-r+<&@x$9xx_5H+^fuE-r76R1AMr=c(8UT8UW%?4_* z+Xq^@BBblzNkLoaLZ^=2ZSelWrKN1t;+m6|>Ho!r27d z-n|`9aPAusY-2Mh_j z(cS`*nUK3zh_i-`e+en|a+FnVtzcs{n;Z^$!Z=;-W+QViehedK6bEkba;920^vV6? zRETw=SqEk{NcN?24W4d&h61AryY0c-(QYSBFOSp1g$!@X@O`%^X<>B-_o7udTBPWO z6ol0twE7hMaKz~?bE_{c=-dxK&svVNQ3Ki+Jxwh|CV#e0e`y zV_@yFbz)8E;oosf{))KyFE+^_VV+Alely<(0cMbKM zsfNWY9gRc8GIEuhSmC0*JMvWM>AXU(>IFCS@~dF9usTd z`#@h!B!&Cava721I8R@yWx@R(CXn|YKx@6tR{V|)a<{r5rK-Q!sLx5{IrAB^Ti{n& zvyLrq-KVdKE6YhNyw-o;pE>-Zl zjGTcg+cKwZ&+bx(M4#=>nqJ!Ev{%niJpE2DRwD2|Fh*B|SQTxu?0QsWa~7u6@&z4% zQzVY18@NVaKbG!{o4!v4hcp9G%;PV=^$a*$_}NJDi^SIKy)##KEzVMla=nCpZ@cI-JWjjdLYsA1CNb2kR6 zN;OW0_(%^)qol^*ZsHIFIf2(!+Qd@1&eVmfXaIuzw8o;ih|+>*e9F z=D!xLj@2YuV!+}Wk!MH!+<6sD9S%!Z(;8VFf}oEsO^XjWo1JYoU+Gt^Md=ZlLo(RF z!ptc7kSbCGGDpynCg&;UoSCgb z0F&;?QD(I#d5sf+ImQvbD59x22aRAcV{i{eGv7K6&Z+jpGAppwd!tNHxM*g?UZmnJ z)u1=9*N2{C01h&brOu$?#_FkdU{joh`L7X;L(QWaj+#yv`xXd zJ1@M4>FlJ3Uwz{DfylfTDzY^z>1}s5q$cWm{Ucz#XdON&7U&wy^(|h$*Gz8kyux%N zUdb81B1E`Vs%p4tMp48g#s0HsE_~58ggABAdcRxB!4Q(MXptD9+nB3(yGUHt{?%vN z7CWB?GwFTTv3@Y2B;Ng{;yI3CGnOSbLanR6^PnQC4rLzl(BDTPQPo>5d5c zEx5DaFpi>vXRDvVpP41sx(1wy8TI88c`Wd1j_13bB(NsKs~f3HeJzx1=}DXhMl|Zy zH7k5f>u-?B*w0jpPy0yJv++gi3f>#-ev+Sha_~X(w`=)Ouj$lp@%1g#it>-DJee`* zq+=ytn4W`gSijP&pHsv8LD2*SLbyVY!8_3a3-^M=CG@c=?*1T!Ml?%cVVj(ujPz0I z1>;iX*O~j*iFg&l8gyaO!H(E#2y_v#5D7VD7SI`Uk+pnY?%sc^^jgSxix2&I$;h~D zZSuVc(Yi2Zs^y%9^KyB;`PaikYbRcXae8{nClOz@Q~lu_flPH2Ps>%LE*sAF1v44O zsm4UP(~0ZqY%@1Yd(=O?N^wrdz@8d@!0!rOGlH$HCDre1{haDb(_`{zPqS!{p&;pO zWgx9<6E-9WlLC(T7ngK?ArxT6&}X_M-`KNL2bWr{`_zo zr$T-Q67kiy^mRo0V&D$m7_tJ$!{lL5m=aX}nmJ4!E-w#PP?Cbd;4ql>43E#y7|l1Nf&ZSx3B~|m zy1JQVnj2)3#lK8<%nSfdE{`ze-xic32Xehu_}tgZy8{=&M2UvN5TJk|jKg6{$Vs2Bj?9PdJH z0swws0ASk|0D$4u7`^gZ^&j8^#P(Y1DuC<1&+GQGXLt{pmxh@y9yR_kwSG4_0DzY0 zp^Bnm;Ot($Te>4Ws5j#0*4%uslL%@bQ>W!`hEz;pc1RCQNJ{5Rd?==3K&JQ@Vo3S$ z)sz0R(7rO$EX{t`iFgxk5Dyx|R};?zWK_1q0zVG$S_ZW2?tW=3D{C9crM{LcD0o${ zurK#>YjEh|ZO&|d!K?AIk)SU}4}SWFP_cX4LJ8?ml(uZFwFJ+<1z5k6H`9Z(%SBdu z+a4Nr{(>#pFHvSvm{Lg*&BqdXcuchbs`Y?w!rEp_+Di@Ma=+(L@>SQmk6p39BO?f$ zaxXtnKA^}m#Xa-8>$RhW&89F$#qggemjO)(I*lXR^|hF6DQYPCWMH{3P-UnR`gbf# zd^8f*Hy@_Ai%m~!!%{n7W0 zk4@IvtE30vODkAatjiTnF&NdvEf2Q8MK&(XW6Kaoe9AT4U|tB-khCqC8sPSoBL2Y8 zOdLoJjgH2(n07g)=R$uR`HgNA*=t$g_9TABe z5P_HffWz6(eUIomWEB`#8RMrCL%O8((iNyJzyQ;O3MyQRX&7Y3I-W=jhichV|P z%|wViDc3w3O<~|~;_{V@%pJ2x4SdpR!3!*(r{x?qL0WGeVXI9+oIy8>o(Enw5vBLxv1D1!j4ZWIDfR>I%Pdz)$cV(jG7Xn@)tg= zw@z_=KX$X4InjPGdBBXokUp4WQ2eFF(bincT+YXt~pVL)&}_QEW!I zRC|t_iDU0*$GK(SZ9@%a95|z{dHKz?BauXc5-AQEzE|u}vR8E9J;)ZyMF5M+vs~K9 z9wb>puI#=#!3*`IC^ytX@lGLV)7sK3qHx5=7TWk`ra|1a^p9QB594OR;6vr5PJQ2= z{Bp+H4SFKCu|Vr!(v5_<2~C_E5(LdhoWq%rdSk(x5vd`-q{eCE)vr$i0*}p#$BIgy zl6$e#E{gX(AeoQ($oy{NdLi~B1%hnOADMO|^YP5*1%98Pg-g-{xh0WDtsjlBzrY9Y zHQc_PPkR@)1e<4P#-Gl@A8~9D`CML8ei|EdX|LZzKZvQ`$}je!8V6^rlt-Vhl%FGc zzWvD7SKB*Ht32<2O>VN%!tt^a{ph29!+>1IavSqR`6b0>K}i(LWZS%;+GN?!-h3~! zhQo6*bFLHE)tC@FAv^acBlfY>kVsjDRKjOf+T5;8Cd`5g!0rHGA@TRbwl#mMio*z! zj^x<};%U}`k8F^oO-dc%0PEU6tI9@{~J~$(V+%7Qd-VL=G*l^$E6C%E^*n zvTWxCr5`_=xKg4*?9J)tY|w7bw)&qQ^=XISwwhyk1ekhQe(x1ZC@sJ$c?h#pwhM32 zd_ZbAU9#@_x#I}4bHO^0@1*aFpx!b(-B)ANe2RK#Lgvk=r~KTR_0yhfFZZGYv5~VU z-7tL-i+e_W1nmG9yAy5*!bqfnDhkmaY#n&l%vhx zvwleGCF@Nx>N$VjrXP>E(foq&S#QLjKWt+a#7WR26ZFJq|9QdNf{(A$2(AH_0s}%P zYxA+ym|RxOxp2W{@1Bh;bL=$)IeZB%` zsv7Q|=q&4yKG>^`C)$J0|Gr}wXEt-Z4e{br02m6N{5DX1JbL@z?Ps0x=tOQx}jrpzbzdbKG)`$jt{b&fnO z`le30vNu>qdiHEHnKgk|H%lI{+ut$PYW~Ct^s*9ZVmx(d*y^TjK)`j^R!R6q0_piR ze2oaKlvHDEl<%jBX+=#-{z`-f^UnHz&Vu%#>EY_)F2f-0dv59Gmp8ZFy<3QGWY{h| zrGC?ji3(=$R1UH482C}E46}StS)zO7k~ap&PL>Py((}?8vK`BP4tF4<3OXY{h-gmP zx8SjDTF6>8zw5&SO?rWDsSxg_NdsP!UXpyT4R|Q_0(X1g>W1>}it62F-YJ?IvL%y@ z=#5s@-P=CP2$Zck3ndmqY_R|7>&T{l32 za$7Dn@dDhqFp90Tck_HIcbHGmuyZcA$_1qRcy>lhNxq$}4zCH^Gc;8booQ%A#P`e> z=D{HCn9I7!I{!{7m9uasc*)aeavO@X-l%wMHBxLbtx}{Ruc+K+Tbcvup0snQMCVjR z)e6o8Wgi+b=D45ve-TReIJ^qcxAh>|zkH{zKR6k!fZHwHhf36}lyl!vL151O^}?g; z2|fCPxpe%`sG@I1+qnl*CY98|)d;eO?zvt3sidpnt7vDF_OCVtSTBV|h`&ENS`?G0 z8GXK$^ayhzgJqNXJtCoYBotWHl-atT)+9Br_NMatF%>AQEihUSJG7y@47BhoZ!Xe zR&&>};*njrdjXh~%oV6yLa>JBb$zuzMO(SH+Qv<^o-96&|MAY|4kC(S&q2laDO})( zk>{W!!vjL>BESIOT(A(sGv%o@AF&$8xtvY}I{Pg|5;8c0%ves~{;|&FddH}>qJNAX zE&a4sGDU|m0v3)5Y!N?MaJeqKV-;m;iL53(#A3J65D#_HStaQE@@9 zBl{e|(vfDpgCS1R^9f29zdvPqbg((J+36mJ7?d`xR&Z#wsJb@`3?*-@ZL@TzzTDJU)-B$%9C!!(z`kFbETfZSQdk$FjkN|^IdmkN_Q{mBl7to6{FjIps(MCjU<*xJ~kQ11dTt^F*;p(?FoVxW*j zl<{IACZ+aZ6lcwPA5tF_r`eI%#q$g6qk*-sMv0TpkeZj|MHaCz#{gqL5yU=5TkV0! zZ9b5s#K8tXol%0BcuZwnR@P_FqaZ^uhKKYYIctB{lfbFJt0fs%>th8yrq1({&6_k! zYE-K89FU$duNfM0DF!Fy`<{Bsgt$M_zc4Lp_TC>M2xpN>W61hCFd1J@+CTP{=AOjJ zBX(V}J%~b7(`f8l8`5+*;@iiPCJx=(F^1&yuCIEAmG~!d#}pn$hQ+P7O1)p$;+QK9 zfvpK*__YC^E9>?}1F#(Nzx6M#`f4BFe0| zxfI2MB$VF&tkI zUXZtc#)XYwd~xx-k6lN;%GcI1`|wkvKU?bkG*!tzdq1|WhC{rs;{9}C)9!r3Z{6l8 zbMaj8%!TX?CqR9qR!K;T>I%EuQ#H?gm*0RZ`x~-X35pa|9B5VBxe$hu$}XCVHLi}W zBF3Sj^$lJzrivBKSto*Zug2_|FeuJf%yVRL90d=Ou_T?R4kaX;*1{T=5fbK-y?kc2 z^G!4L#~Ih57Tc47Y{KsZmXwzOP?YTceIUuGv6%kO@3e&X^}0Qpz@*QX9jI0lSnB%5 zp!8=wx_%MA544u-!~6oTd3Lni-Gvy^dw60>U6qc=-@eZY0-kdFEEnxqC^>pB}0$AMoCZI3BB4K7C%(q(TIv_I^eSuZN*P$$`01-H_`b;3ERSq_ z)%0$R^#ZF0l%Qf=`rLq2VS9lqZ#An2@Uz1Yag{&eMA#$5eFf%7wx`-avd1|2I3OVZ zrW9*TR~4x@B&SmdlGZeHgSbWn#I#xe>q!+ZkZ7+7u9q17#{*=8# z*6lJu@e{!`Mx}8lMbl#0FyoTv7TF74xNn+E=4<mxC#Lt=JdLUnm2QnUZ*XOkbhi zx6{=HX}De;n9b))Z+&Ah<5rDRd@nX*dG+?b^~))d3dyj*AHM=0u&4E|{C|L1=cPP% zg_QjXwH*e3F~*BjHAOnwA>l9wA2=QWP%soM1eOqjiW!2TFenrzDj@&{!@yvLX`7M% zmEiHj5#bc{eiH-tcVUCqB;eaeH_{!0o?^hAw^{_Ar>r69+#J zxF-?@dxWR@0w87AZ6g1{`KKlf<^o4JyC4A&X(%vtJPQC3mxfA9h>MC#v}PPm<0;ht(lI~; z!vSC=rRNyAU3|#+Um>H%4*^aHcR2p@MLax_?oXUWob3D&4o^INMgC_nB90E?a0gLI yQHY%b+|f=_LQ>2gE+y&&mT&??>>Z`y!uSkfe19BNLTUI4fQPEOD%DE1QU3)m932b* literal 0 HcmV?d00001 diff --git a/public/apple-icon-180x180.png b/public/apple-icon-180x180.png new file mode 100644 index 0000000000000000000000000000000000000000..13cdb2b5cfc8ca40e3d8355df64f4b1aa5cd9885 GIT binary patch literal 6786 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 literal 0 HcmV?d00001 diff --git a/public/apple-icon-57x57.png b/public/apple-icon-57x57.png new file mode 100644 index 0000000000000000000000000000000000000000..45ed42295b5f7fe32103c99567d285869ee37ef2 GIT binary patch literal 2156 zcmZ{l3pCW*7sr3DNG7S}F?mIyblrK688fCSlV_T#CNkc}7>qGvGBaMuql8d;aM6<~ zuZkF>ymgbJT$C;;&vKDhh|%Y$0XRmYiXMguO>#TM5>4P+THC0_z z007h+9c<{JC#;%^GB~GiK6wgsYXYsQ)&NkE0a;-xfolaJ-JSxJb?Cnb7e*`xIu!t- zw*x?YA^`jaZpBXkfEWn?lfD2z%mDzX;7aWw5*SeSbF#Mqlanv|i!ZxvGAH5nB77 zL*o^r6C;iAos-6!(}(xzKb|T#Wb3yxt*ps8a`rNH11VYVtAv9zM71gpn~>x2Bf!sk zn|HUw%|llpb(&^-^Yo)BI7- zWT(H@^g3pYco3$qSHPj(yZw#JNe0&+StT}D2C5$~MZ=PM7VlpwQH^S3`nZm!z$nX39VdRMLDhu?O8RqQJt+{%<2w9LYNGa&ZA z4Nyd$GpOb?r1A6z*Rcl;JuWRpb5Xy1{%MBH0PYMQkGwA!%u=0=1+H)Wsky2AW-MGA zCaGv*?(j~*Lk1UQTk<}BiK%p`P0-$p^ITNz|1~cB#ov|*A5@s+zOJaAoKU^NBvxeE zY|^s%V5-Jca>)M3jre!ES7ABB-OCc+nllRbIt?H?-S|YygEwu;#{$o5|85YW$83Oj&B7svzP&D7D^qT@%d4?dLEEaoUC-BA=%9{g8|=vz zK=_)Ue9nIwxk^zeR|X$oX<6kSbY<2$Mzd+w&~594>zsI|?Rcekk}DP^N?8Be^oq6Z zxNp++;k69$q9CsHRhemwPs%IX*RbkoMo}EjNbkTf@>(DJ0fu7YwZ%l|lHuUc94mj{ z&KH$O-6C4^*45hZU|VdR|=bsnT~0qU`n{Ti8`9+g6a-R{2aa4Yl+TxSCXR-!$H-o5~RkwwrYz zW0QS&7Q>6vgzg<1Y_f;uS4yrztj3->a%!AZWzf!MCAddfhN;Q0ZLNLg0O@$xkY8rz z&wbN1E|%ivvk8i0#0$E@(i5YdhitZ52qWZWO!L@ElBnh9g% zZO2_WF)VGiVe=o6!QI=G*I8~KExLPJI-(nlJ zK0HaD+f}do+{jw!g$OB7xy3Sn5hjt+-GpsE$@+*B{r9lACLwd&<%Css;tTEp@)zH~ zE!r)NHG6z-61UNu?6U1`s_vNv68-Hey5ehTMP#Z?R8@>Eowh;5c)+GiJqJpoRPF{h zBBNuS>5h-895Sn{A6I)mYt9f>ceL^B#2!`MzDr8=kq1RJ+eKzo!3CGxuV}F=T_Fk+ zKeh5t-@SQ7TkRFk@Us(d7P^&I=aMq>C9+-#GIM*MW81REyMg_c#RYdYAxgnZeu&sz zx+Q0evx247XRytkf?BPGP5GjIJ%nD?q|!(2+fw>@=L_3fqYQq@9ZjS5V)yQqZ=^S* z72{g#=HB$AEy?)CU(s0}ab54dD!w&Mua`g07U)AqdzTzC&C2~9^54=jM(CupgliWK zj3X1x(mF1}R0kG4=HU6c14s6}gb{XVK1A>g%In=}@33cO$zvxenC0a>l~dBm^uly| zfMiiiitc{#so>(nug|(`vC^q?8LFY-Z)7CzhWkfu&79>P<=P)J?`S)A%JU0^@~3)9 zdq&}wYb#@;H|mbeTHR|HHxjq*H%s;K>9XIXBOzh!N zC8WGZ4;8G87sJ1qEV>7ry3aTez0`l0FcDk7N03#sf;ler5ESPp=?4E}n#`9gIJp*{ znO;iV3I6$}B3p*YpDAJ!Sz&C@0ca!|2}9ywXsk05O+=%K7@Rp0Nkk&|^!jxEBY_v{ z&k2b7{|Ttn@zu^^w^~6M8X$^bhOq%h9y5?lWd?FsTq7JD54VI7jL=9F7KXHdq0mN$ zP&lI?kw`#9AR;0n;G9(&G?0deh6VN~&47Zy=2b=KATiI6NVExMiFs_kh)6sLqCx;w zB(FpKi}_xYNDN|g0)s>Vihx!J!dBZV^aq{)GOiqdQP3*VeP^o*i0J%)P&qudC`!Nv zzMl#q;0NxO9-;k9hw2Pc0Lp@ZCg3bE7P#8;3%wws{)5h8PBa@pQYe`c@-!Ga@=>70b}*<46aWC2 zgT0L#s1}<6kpgGz`XC#WZRCSa2LYfoL3Z6+63n**x!G9*f>)|jU;-!FyEy?sxHbS> zjsk#HaOv^~00>3`z{hi-MH&Dou`+60H(jNC9PMm?jm?o&UyuZ@$gu2B1%Yb+Jq~vU zSb~(LgUvxaWps8ZATEQnLwaFs?bXZ-V{oXV++znlp!D2nt42o~iNlXt$F(RBlnUaZ zdTUzRF7a|w6T*M}&uIJc30WT(n^GB+e1*I`sNFt!fgB{4_3b?qw&lNb7FYwi;&rwwZ5D! zzs4`HGkAKe!2D&^x;#m59g)0hi-Yir-6y5r@2k9%-m;Xyg4asTxAR!pS)%p*e&$zB z2_t!|^sH~h0>||wNI!ork3}dcym`SD=j+j=dB0U+Me<^NbZ?^90g=k!lLg6{Hq84~ z`$~Dc1+{h6OLjwgpH_@a7OW$F$!z?xB`F%VqR_zW&+=M0lg)+kB-Sr-&2eU)FBENwkmBa*k^AmR|8Z-CpD=zvtwY=NdclID z>bw<2)m=nN+sS8`gz8&fztB7~B7ZOcbS)!9OdQY}KG`)8yS9yqjXb17I)ZztF8hk9 zFe#Qu34TyJAa)gAPJi6v&^5cSi26k(!t+aT5~Qi+x28gii;wb^5T`wvdq%Hzk89q$ zH?0u?#Z8y{VMHnIE1uQpT=ETd@z<2hJNIKMz08}nu2$j%Pl&?EX;vP$*|=;;OjoF!`Lav4#^nZzbCX%UhuqQ9)CdLk3hmg)GYtxMyXrZ zdGn=FUEzdNJC?Chedc;nJ6ij6BR87;@^OXda}iYJmTrl7KJ01S8ti*k!!-Nz@X;km zLjpNd_CfI0i!RlIGNhNrh$0!E#M_mrXx&j9KvAw5w`v(b)YP|o(rWIF@cqoHSUQ28 zb|9^_^C>m?PTXwc&fbm^zD`pkw_GFrPxqW9%%rLgbL83IJyO@=U=xJDuN7`Mjnqta zJ~1Gik2sR-cetIYNDGsEq%v9!=eB$Tme3i3rzRhkqep~`(-R4c$2E4>DB~1nE@lle z;A^%=?WlPkI(IKM)iuXhJEuhM7rjKes;CXKKD;d0r?gM7)4wZBgIljSAF>);$_Tvk zLicDcUZ5KL*1jQ4>9%3j>%0k%1&TYQle>K}UszMEI&To4;w5}-6yr|xhxnSvV8V`| zqLUgFhKR`{_~%&I4b{|dux&}QNsIZT zUTmL(F5fQTcPq3x$4T>g!@rW&VUF=px1%X}!>fS@-k#u3%d+z`Ok*O|Oy+$Y?6uM% z2xxawY>~%j%jF#}H1-_xkxw+G_FC}5iXo9j7(zML>6@cYHEs;KuP#nFHsHeiR8%US z%>AY=f20!E6hTZpu2r}9;YM8Bn?PN%57i=IF*X|g5y=luI`>Xzht?ZH>l>qF>Q@N= zV^#B*(?f+(9u6|)E#5z&6Q5eaZ++D=cnH2;d{ZKmK2eyF>2Y`EQO~SqSMwzq#o>HG zZ&NJ#x7-(hFVad~GVT!4>hhwKc@x=k&~5|UgSx%bOQR8}OI@j#X#Y4@DSOtJ-jcW1i)q~QbQY|SU`9W!pC`04_5U8O13fdW3%x7^2 z5Op@RmX?*GbDt$jLgJ9kkUc+7uVpr*ML{KA_=fXk;FqGsvGw5idUHrvBAWyXfJUN` z`bdmE+6a$CW6@}=Ax000#3GSa{b#%Xr-07%rTT^a{{qyF$<2@J@Meb~rXPpv%_ad3 zbZ;`r$(u|i2EZ`}CI+VZW^gnTWu%WZ)<>b?t|$zg!r`#62n3hQHK1M;ETumj*=d(1{) IeeUYN0oY#j5dZ)H literal 0 HcmV?d00001 diff --git a/public/apple-icon-72x72.png b/public/apple-icon-72x72.png new file mode 100644 index 0000000000000000000000000000000000000000..48282e0bcb5ac40b77665f834a1b8315a07e6117 GIT binary patch literal 2619 zcmZ{mcUaR&8pnSjB!K`IL0tMJR9Q+IkU)qufdna1B27>rjnIWi5rjk*Ton{t#D*9U zVF5vkC}JU=QV#*?3n~FoK#GWRMk!v{=bq=heV%*fnR#dC{k-3I${#bQJUu81aCJBU z017TtM{kLxZdVzoq&=|INRb$6w!OPO0Mwt8+X#h7#-IdmiUUyFt2r+jpy*U@cK|qM z006vS0N|TsiZ=%UN3j6#J_G|XF+1fmZU3mL zZBbRtmHDdLi9LH>)l_B-T<+q&YPpwwbou^lacaBZz_^Y221|@Ys7m!hZ~fv6#VRZU z20BaRk=#3sG3PVFOLoXO=@l(exDet2dOQVQRca?fqQLE&>l<=nGtbqj`l7l*gl9O8 z0-gm%r6{1Mc700A50S}oV_>rM1}qtDh=Kk74h(KZ9(JZ5CXCer=LMeZh9%77z zZnS-`GO)<8Nv>I8 z?6qN8J1DDH>?WEO`tf!x87SSz$`hbxgKY&n+-$K@FEgLvTfP|Sx;73xd=2&eYO679 zEJW~C79h046>{{e)_hmqPV=c8(0Aw|*w(MNNSsyP1>qW1ei&8+QhqOOE+4d*d8N9d z1C7PvPc3@F)ABjI}J~V^+c>q z0s>=xDt}nLCP<_vN(}ij)kchaJg5%&IF`O3o1FwRm1?{My-V*r%+XX&}h57ag!m z+E>Bfn=Z8}F28Id8E^1oI&fR-5 zXF|v2b}z0o8ETlwJMST9VLf`b1q`iOU~*_qM1S@{GaPx@$V&K=C^$C~mfwGqIDf*@ z&N!c$aKRa7oiBZiZFr}Y$fNW(mfFu?wG%DmKw0a>jXOGu-lcBwEkB-e%3P49nsv@o zoNlyT%rgnUwdj;u)YO^1-1sx`+TI>Stnf_v%ou?$+FT9b(@@RO#t?HEY@LhY+rMsYY7d|T~hoF1j##(p|!srre~&}F>A{e z9_h5Ylr?jzmB-NdWLmMa3Q=FY>&5N{BZF*qh+mZa?Jcv@KtC2AJk3m=x%Q9x^2lgz z!ZJIoc5YSst)R(Qd4A!H2|UJ~IY9j5WP@^>H|RmoCuwqF@qEUJ?oGp{p&B;}&!;^j zf_xi)gMd!%;ka;4GPFE$iu)XQ{q|6UpmZ{wsVNX-GS)xIcSBBo-5@9GSB{+8nSXB# zt?#@w9TM3RpkaCO($L97tJ4k2F{?&9v|Kw}2EY8?{BhLlcH>4{`13+`@=Q13)!-}A z8{!*u1k2us(j9La?}1i0=g_-SUD^eB%09Xldxg~7LwC}HDvSy` zruF{*8jcoSHYW_A7DUWFM^$v!^hxLw{TCkTV0*l6v>Y%W}M>9lh`-tS#;GV^f# z3wsSettDp<#-ZGGJTOF?d~tTuAMD*Z-$AFob@?naU$@xVX0gDEXI`C-dj5P1dtPzu zMLEnPC|^Oik`tguSpxR!G>!CqjVmg<3li+l2j6RyQ5rjQ3>z$$`k005{FzE<(BhFp zkgMm<;3k)idw=?HEfBZ1pB%(+L5><{1Q4YrD8Vy&sNyo%+Y_Ji2jAw*zFSfx#aj6Z zGpQwQO*9qX=!NTZ>(P^p4?PpawUMLr1TSXVYI^(U?&7KEL(P8T)}5v_hP~=uBQinP zNgnwvBUN^+%FW`9MIPdG?`7Gt6^{O}@eR;om-T&}Y4-Hzr13jFtqJtQb=b5VWh{Az z+86V>B*mU=;F0VGPdrZ#dEgOR8)v5EX`1K^%gX?%MsiWlc{2+roZ^ui4Z3H$o#2X9 z$^mz;LkT(;kmyj}eYGxkBK^UD*FfT3n=+}mMnt$$WmgKKG8Mgf4)SYY)ji7z`z^0$ zjvGT{(WdQ*u7aO^%H1yGncaWw9KEz9M|*4_)fyxf(P1Q#V=Vn>G&6=vB6&*C1OQj@{Q>4L%%3?)q;MvO9nJ-CR(J#u zpCw^be$e?32xKXie3@bE| zLywI~!2I`OFbui{lWs;d!-dkBj8GzhXdcG2G-F{2EG#aJVZ}sCBG8icAr(x|NiqN~ MP9Bc64k0K04eljh`~Uy| literal 0 HcmV?d00001 diff --git a/public/apple-icon-76x76.png b/public/apple-icon-76x76.png new file mode 100644 index 0000000000000000000000000000000000000000..920d485df2a8555f0ef3acd2ad717d5fcdc13156 GIT binary patch literal 2710 zcmZ{mc{JNu8^?bVp`s{eVv9yg7a@^E5)r1v(gtNpE7UR-5kw^-q8eQiT~M?rE!uij z7mTe`wNZ?ywx*WSs-;FXqm5-y)Y=}y#GLn>x9^-J_Pcykw45PSH0H8Wub(Id0?-gRa_BjBRFX0pNjS++D z&oC^Rt+#8QQZRG)_V7Glv!1~6x*;t$5qz;^-a#*rej(L^*VPaQeD187|XnwVRomN^k!pc(G%&{Gof-7UzcWG*)%W z0Fg2orAqUUU^y?Oi&9c53L(?!cCK#gW~Kv(0~xe!DSb%K?ZI#G7an?_=rh5qMclfD zwd1_2f0v)1w>H-ix-`~dbE4iRsYB-y{LxHD!~EN^Q^R9|;aw@DTK40$->fBh+itU^ z-%A4l;{IniCgH&@l^ggV&_PMOk?ho0?;t~|(onO~zZ8lTz`GTMkYTX7WUJECX0Y}F zJtrimkz>a6-WA)K$(Sk znTUzAZQDKmoRlngC&`Q`;~Xh!q3OYQT+I<<3h{Euk>mQ}mnS}fhXb~o4uT;xC`m;O z6C+k^f3FWxQ$dDhOs}y+>V=lut5Opz8^!`50l;_hz_NyPYmkj*oX4NaD(2uh&p3rK zaB)Pygwb4gl<4->JHcHxR}f$@dmVZ!Qp}k?y`-fPV%iSX}D(8!_fG_Itg;MnkD+8f>w0Rm|6Axs z%$GCI?FLN^eCj@q-p__Mz9YFVrv>gFT}~I0PG|CZuc`N+gqdcIuQVr=G{?y@d+rul zhqmi&Zk3c5VJo_CMeYNag6nmC4f(Za4i(*~<8wT}oNVPjW^QVq{oIxKLc`x$s_*Au zEJH#qA#;IHp3J5vkFUC*nQ(n6L zcIr%7Nge@N=b8&98%~fSj>eUM%dAQvrFcJ(y>+0#-0`c~h$2l`fPQ_=PXT-L(4=za zV8>S;jeDFZt93H&@{?L&sFo*N4Fe+ladPrZ?e^t=(x=cF!Brl+Z0$st=A#qd6h5 zYyr>E_aaFhooMb;mwWXB@B7{~$UCch>k7g`N3{y|NVC^{q$8c%YO5iWt+?I?Ks&7^ zu}yUKzPI7Po`rTXW$-+_2IU*1Klw^&$>_-G>-xrjo?fZi?p4l6Fp;u(Eq22xH->~m zEc=B-^0~+yWs87zXwG@~cq9dWy7lsjJApWMp6(^+>=kqH9_8wyy`GDEX0=8>MuFB~ zcrk|#o5jr%K*-83dA513K}|C{2~kF<%xFLV1J&&W)cg^uvPts$chEyya}T%Re<1_WrX`Ci!Kkop(|0Nc>r3!F3)3+O{4V!O45;ck z<jLy_GK>?PT}etE{HGdNkmFZ1l_j zrDwJW+N?x416|cnodMm`{=l=Xiq3w~`K(mAB1N3{)do({{}gZb=pkTpX2BaZJ^KV& zRU_;8sRxI+d16|)i`NF9s@Yk*@zrU`K_pLIwXn0h=#R1hp`w( zjfiL~Gzn#Ggu`I*C=3CG#Tj{GiALdkK9_7^5f>MSW^K@Nlhf!ZUf59Lv|JF--B3If z9?K3Ulbxa%v1}%XPbMFbqcH%sc)i}@AI#r1$>eY*D=eH3V6AZ)0Pnn<(fLN_-;56{ zgde_v^ptPgBuDhVLEKqvCSSm10)OAig3AfByHE4@hmQLpIR#(|);Mb-!ID6HocXz5 zj%a+NbC4C!1TYQ`*|+vg$wRbnLf&33KqxDcDSy5No5PQc3bP2MA7e41I58Ig`5223 z27$@2w6es~8O#v6710VG%p_TcVu+y_Y;cG*6D`j`%kPI!L#4|r04~lRPL&QpXZ`{| C9iHO= literal 0 HcmV?d00001 diff --git a/public/apple-icon-precomposed.png b/public/apple-icon-precomposed.png new file mode 100644 index 0000000000000000000000000000000000000000..7fdd425b28c60fcd764e183daeb194664018dcfb GIT binary patch literal 6527 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 literal 0 HcmV?d00001 diff --git a/public/apple-icon.png b/public/apple-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7fdd425b28c60fcd764e183daeb194664018dcfb GIT binary patch literal 6527 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 literal 0 HcmV?d00001 diff --git a/public/browserconfig.xml b/public/browserconfig.xml new file mode 100644 index 0000000..c554148 --- /dev/null +++ b/public/browserconfig.xml @@ -0,0 +1,2 @@ + +#ffffff \ No newline at end of file diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..9f9b56c60bdf7d1a11e144e34e67797ca16f6943 GIT binary patch literal 1281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5)aMo8 z6XFU~z_8~E!`>^52QCUNf2ug`v*OgxAdvwolVR^=kZF4_i!FYMtP5xt zoC{RIwCkG0g4fJDt^-x_uYM#m=N-$A>;M1%*9|!10SwI4k{~}&G=TtD?Dl&P_E+gJ zO3nEC_t(GMk>*FfEDLw{%s=(aLFG>+yYhh@0!$M&^Vz=n>F4_Vt+U9{{>itdNSFOs z&${#PuKD~2;Ef|!dL~MyNObRXU8Snr9J*?2udeol^QW@X=RbRJ;=zKc$zA0%T_cka10yRVBP(MwZ36=<0|STa z@#j%A6j*K`8;bMOO3D+9QW-pR6Vp?D6Vo%3vlYzr%=IjEEftIm z3{7+mOmz*76ao#+6f#Om3as??%gf94GC`_=7^qq=zbO4q+gqT43=$v{Lo!NpldP;< z@{>z*Q}ar!tO9^aix~`;|KF{TrUq=Ml~qP+W_m^mgQ2AnKSNO~P>nc}IZ!p>nJFb1 zASIXAC~^RmNFpim&CE?LsVqok0J}=RATQm1Q!&4_WhUq673(7+ zMn5IlG&R}S+}JQNIW;BG+|1l0Db>O_&A=?pz%VJrGF1<#Ll5Xad0yRqpbZS3u6{1- HoD!M<{R-~I literal 0 HcmV?d00001 diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..008db5fce12febe040d2b4fccd5d09830b747716 GIT binary patch literal 1779 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyacIC_6YK2V5m}KU}$JzVE6?TYIwoGP-?)y@G60U!D_-)7o%O={j7;bqU*H{X_A@EYurYd}l?|Np-=P)`_`7-p3O`2~Yg1p|XbbnDvf z+a_hJGIK^9{ruzd?0DftpMGw&aXWO?i8uHD-^WXf3yT(9|8qiV=C>)j9IVQvJoPVQ znF5}NeT+LPzplsI_@4Ip>0C^+G-lj2lAIPYEz6sOYwmB8r*E$Pe(fCeIj7+7-LXa4G&(PEnS&g)_Nzi({(U%vKy+3YD_wrj`y8~+M8!-@?#xaZxJmQiG0mn*Ut z=rqP8Z+Dlq3Q31#fgH{PkH}&m?E%JaC$sH<3f6nNIEGl9PEKfGbaOK+h*Jw40Po@FVB-VzHC?NOWNP^q1*I)l$m zI@)>xQ(|?8YERD_zRhVbqm(LpFCM$dwc^l8$wdwRj3){mKZ-Bz)ei6pmq}q!UaWS( zHz-eIUs6KJcZQvZM3x-5%zfg^H%DFxwRrmlE86V?rr0x_;NnSgu-rjnPD zn~jXb_0A+EItESHTX6A_>gKekPmGM7JUu^aYst++t*jbcT;h5$`a zz1-qv3pG~c#of4ci>*&?_P4%s>)y56?$tT*@6GG^1`}IFg0 zr@u%Ve>~aGq{P4wcVP-kgNWH?U>vHJxJHzuB$lLFB^RXvDF!10BLiInGhHK-5CbDC zBO@zgGi?I{D+2?E>+$DNH00)|WTsW()?nE69F$VrKsFTTr6zz9|8>t%ve12IswUVc&fowm0? z0~sVhCWd5`<|bKLx#TC8=BDPASXl)Cl@>D?F8{wWf!^28%`3^t zPuEXNEXz#J&nwnPM2vn)vT16vvAMBfVsdIqqPdy5Nm8nXahicynt@?bie;)EP=_AS Vee%4z{XiQSJYD@<);T3K0RYt(+5i9m literal 0 HcmV?d00001 diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png new file mode 100644 index 0000000000000000000000000000000000000000..9fd6997940ba127e0a65ab425c3ae98ab73fc621 GIT binary patch literal 3353 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 HPttz@g|x~T literal 0 HcmV?d00001 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..6a294add010dbad1a77b347666fe0851f8d26985 GIT binary patch literal 1150 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 K`dRtyhyMYY7S2@w literal 0 HcmV?d00001 diff --git a/public/ms-icon-70x70.png b/public/ms-icon-70x70.png new file mode 100644 index 0000000000000000000000000000000000000000..31ccab15f767cd42ff8e81104551101a1ade1aa1 GIT binary patch literal 2517 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 literal 0 HcmV?d00001 diff --git a/public/style.css b/public/style.css index d9aef60..97e223e 100644 --- a/public/style.css +++ b/public/style.css @@ -80,4 +80,8 @@ footer { } #streamelem{ width: 100%; +} +canvas{ + width: 100%; + height: auto; } \ No newline at end of file diff --git a/server.js b/server.js index c025500..967693e 100644 --- a/server.js +++ b/server.js @@ -254,7 +254,11 @@ io.on("connection", function(socket) { socket.leave(socketsRooms[i]); } } catch (ex) {} + idtoplaylist[socket.id] = data.name; socket.join(data.name); + socket.emit("itemchange", { + name: playlistToName[idtoplaylist[socket.id]] + }); }); socket.on("getcurrentitem", function(data) { try { diff --git a/sessions b/sessions index dd115d423b164b7ca50dd3857962188430f37005..14d1d8e310a5b81537890385cb74be9d85151710 100644 GIT binary patch delta 65 zcmV-H0KWf#V1Qtd8v(45976%Dv0y(Q0)jo0p&lp$cHg#>eIFr{?H(NrGBP?fF*-Fh XE-^4PlgA$~vqc}25CQ=`liM#P=0g=! delta 66 zcmV-I0KNZ!V1Qtd8v$aG976$Ov0y(Q0)carp&lp%W)Ns#lYSo{lkFZI3^6x4H8?sj YI4(CgG?T|4FSA7-ln?>{^OM^zCBD8C^Z)<= diff --git a/views/layouts/main.html b/views/layouts/main.html index df8ae40..2248af9 100644 --- a/views/layouts/main.html +++ b/views/layouts/main.html @@ -8,7 +8,27 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/views/playlist_editor.html b/views/playlist_editor.html index 76a25de..11bb6e4 100644 --- a/views/playlist_editor.html +++ b/views/playlist_editor.html @@ -6,14 +6,16 @@

Go Back - Delete Playlist
{{{playlist_items}}}
- +
+ Add new item to playlist. Duplicates are allowed! + name="item_source" placeholder="Item source. Usually the url" /> - Optional Position: + Optional Insertion Position: -
- + + Add multiple items to a playlist. Format is name,url seperated by line breaks. + + + Optional Insertion Position: + +
+
+

If another administrator edits the playlist and you delete an item the wrong From 9800e89ca9c8eb41af0df586cf3b2265a1ff193c Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sat, 18 Jul 2020 18:21:42 +0000 Subject: [PATCH 26/29] Upgrade Packages --- package.json | 10 +-- sessions | Bin 12288 -> 12288 bytes shrinkwrap.yaml | 196 ++++++++++++++++++++++++++++-------------------- 3 files changed, 119 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index 2966e3d..3d9d7a0 100644 --- a/package.json +++ b/package.json @@ -14,18 +14,18 @@ "express": "^4.17.1", "socket.io": "^2.3.0", "express-session": "^1.17.1", - "endb": "^0.22.9", + "endb": "^1.3.0", "handlebars": "^4.7.6", - "express-handlebars": "^4.0.3", + "express-handlebars": "^5.1.0", "socket.io-express-session": "^0.1.3", "body-parser": "^1.19.0", "connect-sqlite3": "^0.9.11", - "ytdl-core": "^2.1.4", + "ytdl-core": "^3.1.2", "fluent-ffmpeg": "^2.1.2", "stream-throttle": "^0.1.3", "sql": "^0.78.0", - "sqlite3": "^4.2.0", - "better-sqlite3": "^7.0.1", + "sqlite3": "^5.0.0", + "better-sqlite3": "^7.1.0", "butterchurn": "^2.6.7", "butterchurn-presets": "^2.4.7", "csv-string": "^4.0.1" diff --git a/sessions b/sessions index 06dde8d6a0c4056a755fd18ead652273b0d72494..673d79a717f45b81d2094ef0ad8658163b0c5902 100644 GIT binary patch delta 349 zcmZojXh@hK#l*dCqKp%e+?cSCpOblqnMJ|=GE_?(Fknf_BbC3+*?6wDB7mh5+>#nphbc=~a~IN;5Ag_w$d)3$%1HCa3=(int~~4VU6GG!HQ{v;rbSb3IGT$s1)2Bn-_=Oiay; zEi7ueK)&GL%D}&s|2F@Y&4LOM{1Y2A)cJ2Qs1fo68wbPWTl%W3dMeDmjFZ2}DllpS E0Ptv3N&o-= diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index b1ba5bd..a5e0457 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,5 +1,5 @@ dependencies: - better-sqlite3: 7.0.1 + better-sqlite3: 7.1.0 body-parser: 1.19.0 butterchurn: 2.6.7 butterchurn-presets: 2.4.7 @@ -7,16 +7,16 @@ dependencies: csv-string: 4.0.1 endb: 0.22.9 express: 4.17.1 - express-handlebars: 4.0.3 + express-handlebars: 5.1.0 express-session: 1.17.1 fluent-ffmpeg: 2.1.2 handlebars: 4.7.6 socket.io: 2.3.0 socket.io-express-session: 0.1.3 sql: 0.78.0 - sqlite3: 4.2.0 + sqlite3: 5.0.0 stream-throttle: 0.1.3 - ytdl-core: 2.1.4 + ytdl-core: 3.1.2 packages: /@babel/runtime/7.9.6: dependencies: @@ -81,10 +81,6 @@ packages: dev: false resolution: integrity: sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== - /asap/2.0.6: - dev: false - resolution: - integrity: sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= /asn1/0.2.4: dependencies: safer-buffer: 2.1.2 @@ -160,15 +156,15 @@ packages: dev: false resolution: integrity: sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI= - /better-sqlite3/7.0.1: + /better-sqlite3/7.1.0: dependencies: bindings: 1.5.0 - prebuild-install: 5.3.4 + prebuild-install: 5.3.5 tar: 4.4.10 dev: false requiresBuild: true resolution: - integrity: sha512-fsVcoGXxnseNajbfFbth0BKnDWebPY6x77UWfrBHApCKq1yo41DlWnFsffOsLpjkQ4VKgDU5C3aUtiw3wGGU0Q== + integrity: sha512-FV/snQ8F/kyqhdxsevzbojVtMowDWOfe1A5N3lYu1KJwoho2t7JgITmdlSc7DkOh3Zq65I+ZyeNWXQrkLEDFTg== /bindings/1.5.0: dependencies: file-uri-to-path: 1.0.0 @@ -187,6 +183,15 @@ packages: dev: false resolution: integrity: sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== + /block-stream/0.0.9: + dependencies: + inherits: 2.0.4 + dev: false + engines: + node: 0.4 || >=0.5.8 + optional: true + resolution: + integrity: sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= /body-parser/1.19.0: dependencies: bytes: 3.1.0 @@ -393,14 +398,6 @@ packages: node: '>=4.0.0' resolution: integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - /define-properties/1.1.3: - dependencies: - object-keys: 1.1.1 - dev: false - engines: - node: '>= 0.4' - resolution: - integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== /delayed-stream/1.0.0: dev: false engines: @@ -523,18 +520,16 @@ packages: node: '>=6' resolution: integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - /express-handlebars/4.0.3: + /express-handlebars/5.1.0: dependencies: glob: 7.1.6 - graceful-fs: 4.2.3 + graceful-fs: 4.2.4 handlebars: 4.7.6 - object.assign: 4.1.0 - promise: 8.1.0 dev: false engines: - node: '>=0.10' + node: '>=10' resolution: - integrity: sha512-XSAQRreb0LzzSAQG7DRCaidqWYdtfOjgHF6VTaN7p6FaUVfFZq4Ki2d5q8WO3cdsEqbYBV69XzG+FRHzNukwiQ== + integrity: sha512-EHu7Lz1q3OOPSv1wyxN0pOMhAcljx0UUACrFAnSgoBdKc6YCBFl7qW3w6TQZ8d6kWA14xAH9pLMsR0N9vJ3iGw== /express-session/1.17.1: dependencies: cookie: 0.4.0 @@ -678,10 +673,18 @@ packages: dev: false resolution: integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - /function-bind/1.1.1: + /fstream/1.0.12: + dependencies: + graceful-fs: 4.2.4 + inherits: 2.0.4 + mkdirp: 0.5.5 + rimraf: 2.7.1 dev: false + engines: + node: '>=0.6' + optional: true resolution: - integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + integrity: sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== /gauge/2.7.4: dependencies: aproba: 1.2.0 @@ -716,10 +719,10 @@ packages: dev: false resolution: integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - /graceful-fs/4.2.3: + /graceful-fs/4.2.4: dev: false resolution: - integrity: sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + integrity: sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== /handlebars/4.7.6: dependencies: minimist: 1.2.5 @@ -759,12 +762,6 @@ packages: dev: false resolution: integrity: sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= - /has-symbols/1.0.1: - dev: false - engines: - node: '>= 0.4' - resolution: - integrity: sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== /has-unicode/2.0.1: dev: false resolution: @@ -930,7 +927,7 @@ packages: integrity: sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== /m3u8stream/0.7.1: dependencies: - miniget: 1.7.0 + miniget: 1.7.2 sax: 1.2.4 dev: false engines: @@ -994,12 +991,18 @@ packages: node: '>=8' resolution: integrity: sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - /miniget/1.7.0: + /miniget/1.7.2: + dev: false + engines: + node: '>=10' + resolution: + integrity: sha512-USPNNK2bnHLOplX8BZVMehUkyQizS/DFpBdoH0TS+fM+hQoLNg9tWg4MeY9wE8gfY0pbzmx5UBEODujt3Lz8AA== + /miniget/2.0.1: dev: false engines: node: '>=10' resolution: - integrity: sha512-yrgaDSMRzrfYTkudB4Y6xK8pCb7oAH2bvfv6iPY2m6CedZfs9yK4b/ofh0Vzv08hCYXH/HHkoS8an6fkWtOAQA== + integrity: sha512-MX+QfVIPAutz6c+T7WKuFKtjcw0nOyRRh1ubhTDD+z/e/pKcSAsfAV63aQKUgb1MFRT1GyfJeW53N5fHkX0wIA== /minimatch/3.0.4: dependencies: brace-expansion: 1.1.11 @@ -1075,12 +1078,37 @@ packages: dev: false resolution: integrity: sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== - /node-abi/2.17.0: + /node-abi/2.18.0: dependencies: semver: 5.7.1 dev: false resolution: - integrity: sha512-dFRAA0ACk/aBo0TIXQMEWMLUTyWYYT8OBYIzLmEUrQTElGRjxDCvyBZIsDL0QA7QCaj9PrawhOmTEdsuLY4uOQ== + integrity: sha512-yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw== + /node-addon-api/2.0.0: + dev: false + resolution: + integrity: sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA== + /node-gyp/3.8.0: + dependencies: + fstream: 1.0.12 + glob: 7.1.6 + graceful-fs: 4.2.4 + mkdirp: 0.5.5 + nopt: 3.0.6 + npmlog: 4.1.2 + osenv: 0.1.5 + request: 2.88.2 + rimraf: 2.7.1 + semver: 5.3.0 + tar: 2.2.2 + which: 1.3.1 + dev: false + engines: + node: '>= 0.8.0' + hasBin: true + optional: true + resolution: + integrity: sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== /node-pre-gyp/0.11.0: dependencies: detect-libc: 1.0.3 @@ -1101,6 +1129,14 @@ packages: dev: false resolution: integrity: sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= + /nopt/3.0.6: + dependencies: + abbrev: 1.1.1 + dev: false + hasBin: true + optional: true + resolution: + integrity: sha1-xkZdvwirzU2zWTF/eaxopkayj/k= /nopt/4.0.3: dependencies: abbrev: 1.1.1 @@ -1156,23 +1192,6 @@ packages: dev: false resolution: integrity: sha1-8MaapQ78lbhmwYb0AKM3acsvEpE= - /object-keys/1.1.1: - dev: false - engines: - node: '>= 0.4' - resolution: - integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - /object.assign/4.1.0: - dependencies: - define-properties: 1.1.3 - function-bind: 1.1.1 - has-symbols: 1.0.1 - object-keys: 1.1.1 - dev: false - engines: - node: '>= 0.4' - resolution: - integrity: sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== /on-finished/2.3.0: dependencies: ee-first: 1.1.1 @@ -1244,7 +1263,7 @@ packages: dev: false resolution: integrity: sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - /prebuild-install/5.3.4: + /prebuild-install/5.3.5: dependencies: detect-libc: 1.0.3 expand-template: 2.0.3 @@ -1252,7 +1271,7 @@ packages: minimist: 1.2.5 mkdirp: 0.5.5 napi-build-utils: 1.0.2 - node-abi: 2.17.0 + node-abi: 2.18.0 noop-logger: 0.1.1 npmlog: 4.1.2 pump: 3.0.0 @@ -1266,17 +1285,11 @@ packages: node: '>=6' hasBin: true resolution: - integrity: sha512-AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA== + integrity: sha512-YmMO7dph9CYKi5IR/BzjOJlRzpxGGVo1EsLSUZ0mt/Mq0HWZIHOKHHcHdT69yG54C9m6i45GpItwRHpk0Py7Uw== /process-nextick-args/2.0.1: dev: false resolution: integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - /promise/8.1.0: - dependencies: - asap: 2.0.6 - dev: false - resolution: - integrity: sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== /proxy-addr/2.0.5: dependencies: forwarded: 0.1.2 @@ -1433,6 +1446,12 @@ packages: dev: false resolution: integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + /semver/5.3.0: + dev: false + hasBin: true + optional: true + resolution: + integrity: sha1-myzl094C0XxgEq0yaqa00M9U+U8= /semver/5.7.1: dev: false hasBin: true @@ -1481,15 +1500,15 @@ packages: dev: false resolution: integrity: sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - /simple-concat/1.0.0: + /simple-concat/1.0.1: dev: false resolution: - integrity: sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= + integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== /simple-get/3.1.0: dependencies: decompress-response: 4.2.1 once: 1.4.0 - simple-concat: 1.0.0 + simple-concat: 1.0.1 dev: false resolution: integrity: sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== @@ -1573,14 +1592,16 @@ packages: requiresBuild: true resolution: integrity: sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg== - /sqlite3/4.2.0: + /sqlite3/5.0.0: dependencies: - nan: 2.14.1 + node-addon-api: 2.0.0 node-pre-gyp: 0.11.0 dev: false + optionalDependencies: + node-gyp: 3.8.0 requiresBuild: true resolution: - integrity: sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg== + integrity: sha512-rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw== /sshpk/1.16.1: dependencies: asn1: 0.2.4 @@ -1672,11 +1693,11 @@ packages: chownr: 1.1.4 mkdirp-classic: 0.5.3 pump: 3.0.0 - tar-stream: 2.1.2 + tar-stream: 2.1.3 dev: false resolution: integrity: sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg== - /tar-stream/2.1.2: + /tar-stream/2.1.3: dependencies: bl: 4.0.2 end-of-stream: 1.4.4 @@ -1684,8 +1705,19 @@ packages: inherits: 2.0.4 readable-stream: 3.6.0 dev: false + engines: + node: '>=6' + resolution: + integrity: sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA== + /tar/2.2.2: + dependencies: + block-stream: 0.0.9 + fstream: 1.0.12 + inherits: 2.0.4 + dev: false + optional: true resolution: - integrity: sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q== + integrity: sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== /tar/4.4.10: dependencies: chownr: 1.1.4 @@ -1867,22 +1899,22 @@ packages: dev: false resolution: integrity: sha1-AI4G2AlDIMNy28L47XagymyKxBk= - /ytdl-core/2.1.4: + /ytdl-core/3.1.2: dependencies: html-entities: 1.3.1 m3u8stream: 0.7.1 - miniget: 1.7.0 + miniget: 2.0.1 sax: 1.2.4 dev: false engines: node: '>=10' resolution: - integrity: sha512-jjxOAfOsUE4tXLrjZeLnvhvMeuE31TpvhP/SHmERNH+s5aDK5oseons8iplRrfxrkh+Gj4QKGzXf06gLMdBvIA== + integrity: sha512-H2ja9W9j89TTf+LMQxo1VrdpUNCcjjHnwY6M4NmvgUaQLwNZnIoBwbch4iaT8q75trUK83PzmbihkUBd5Poyfg== registry: 'https://registry.npmjs.org/' shrinkwrapMinorVersion: 9 shrinkwrapVersion: 3 specifiers: - better-sqlite3: ^7.0.1 + better-sqlite3: ^7.1.0 body-parser: ^1.19.0 butterchurn: ^2.6.7 butterchurn-presets: ^2.4.7 @@ -1890,13 +1922,13 @@ specifiers: csv-string: ^4.0.1 endb: ^0.22.9 express: ^4.17.1 - express-handlebars: ^4.0.3 + express-handlebars: ^5.1.0 express-session: ^1.17.1 fluent-ffmpeg: ^2.1.2 handlebars: ^4.7.6 socket.io: ^2.3.0 socket.io-express-session: ^0.1.3 sql: ^0.78.0 - sqlite3: ^4.2.0 + sqlite3: ^5.0.0 stream-throttle: ^0.1.3 - ytdl-core: ^2.1.4 + ytdl-core: ^3.1.2 From 3122fbf40024f118ab803ae7ae526509f4e81552 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sat, 18 Jul 2020 18:27:31 +0000 Subject: [PATCH 27/29] fix packages due to endb issue --- package.json | 5 ++++- sessions | Bin 12288 -> 12288 bytes shrinkwrap.yaml | 54 ++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3d9d7a0..d93e015 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,10 @@ "better-sqlite3": "^7.1.0", "butterchurn": "^2.6.7", "butterchurn-presets": "^2.4.7", - "csv-string": "^4.0.1" + "csv-string": "^4.0.1", + "@endb/sqlite": "^1.3.0", + "@endb/sql": "^1.3.0", + "tslib": "^2.0.0" }, "engines": { "node": "10.x" diff --git a/sessions b/sessions index 673d79a717f45b81d2094ef0ad8658163b0c5902..0d5033383d8f6874e6cca12bf3d1bdb8255ced57 100644 GIT binary patch delta 188 zcmZojXh@hK&A4x(j5FiDjR{Nmd02Sb8F*jw`|(=xv~Mgd=P_v1YcFE;WpCn7HqK7W z%}fmT@=Y%{b(z<-NBlfR$ed9$E`F~6EBvo8}N Mo0vaM&eWd{0LH&MX8-^I delta 60 zcmV-C0K@-)V1Qtd8v(A7976%Fv0$VR3Ih!}01fL8P7OJ+aVrh8IUUOa3Ih*m01w&^ SX%COH5g;-Tk$@?aX)l*HViG|B diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index a5e0457..7b804f8 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,11 +1,13 @@ dependencies: + '@endb/sql': 1.4.0 + '@endb/sqlite': 1.4.0 better-sqlite3: 7.1.0 body-parser: 1.19.0 butterchurn: 2.6.7 butterchurn-presets: 2.4.7 connect-sqlite3: 0.9.11 csv-string: 4.0.1 - endb: 0.22.9 + endb: 1.3.0 express: 4.17.1 express-handlebars: 5.1.0 express-session: 1.17.1 @@ -16,6 +18,7 @@ dependencies: sql: 0.78.0 sqlite3: 5.0.0 stream-throttle: 0.1.3 + tslib: 2.0.0 ytdl-core: 3.1.2 packages: /@babel/runtime/7.9.6: @@ -24,6 +27,19 @@ packages: dev: false resolution: integrity: sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== + /@endb/sql/1.4.0: + dependencies: + sql-ts: 3.0.1 + dev: false + resolution: + integrity: sha512-iC+tja7SKqPUPU4oS8nH2CpGOQJlL9vqqlpLd67O3ipM9hNeCsMcGsCIENtsNLDJvojrTuXqj0YKKDo15U58ww== + /@endb/sqlite/1.4.0: + dependencies: + '@endb/sql': 1.4.0 + sqlite3: 4.2.0 + dev: false + resolution: + integrity: sha512-80afEYXuFdhQRRIeuE7Y+7YAqxg0HFTkgi0LUrXiJBwjnMckti3ct+iBcuYFQzFkU1oex8JHAZz9KdCR/wtebg== /abbrev/1.1.1: dev: false resolution: @@ -458,13 +474,13 @@ packages: dev: false resolution: integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - /endb/0.22.9: + /endb/1.3.0: dependencies: buffer-json: 2.0.0 lodash: 4.17.15 dev: false resolution: - integrity: sha512-uj0jVcdeAL20WriEE6GrB/QPp3+0xAW5A1ZVzLAgbqn8W7i3VJIk5MqT9bf1DxhPFPMgn9at5p7dBUWIAwA2EA== + integrity: sha512-i+HoBOxgGt6ulaUMTq1yyyaZQL8n+/IWAUDMJ5U/GI3fTZbWO9aW5jj0seQrH0o2qdp06CHyB5XRYPa6NZSVig== /engine.io-client/3.4.1: dependencies: component-emitter: 1.2.1 @@ -925,6 +941,10 @@ packages: dev: false resolution: integrity: sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + /lodash/4.17.19: + dev: false + resolution: + integrity: sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== /m3u8stream/0.7.1: dependencies: miniget: 1.7.2 @@ -1516,6 +1536,10 @@ packages: dev: false resolution: integrity: sha1-XtwETKTrb3gW1Qui/GPiXY/kcH8= + /sliced/1.0.1: + dev: false + resolution: + integrity: sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E= /socket.io-adapter/1.1.2: dev: false resolution: @@ -1576,6 +1600,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + /sql-ts/3.0.1: + dependencies: + lodash: 4.17.19 + sliced: 1.0.1 + dev: false + resolution: + integrity: sha512-RhWj2eD7+XlGRsPBvNrnovN7SlgF5OUjwyV4L9DeEmY7CZiSd6GJ8BV+/sDS2h53UeIL6mmwm/6niLgcqTwdsA== /sql/0.78.0: dependencies: lodash: 4.1.0 @@ -1592,6 +1623,14 @@ packages: requiresBuild: true resolution: integrity: sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg== + /sqlite3/4.2.0: + dependencies: + nan: 2.14.1 + node-pre-gyp: 0.11.0 + dev: false + requiresBuild: true + resolution: + integrity: sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg== /sqlite3/5.0.0: dependencies: node-addon-api: 2.0.0 @@ -1765,6 +1804,10 @@ packages: node: '>=0.8' resolution: integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + /tslib/2.0.0: + dev: false + resolution: + integrity: sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.2.1 @@ -1914,13 +1957,15 @@ registry: 'https://registry.npmjs.org/' shrinkwrapMinorVersion: 9 shrinkwrapVersion: 3 specifiers: + '@endb/sql': ^1.3.0 + '@endb/sqlite': ^1.3.0 better-sqlite3: ^7.1.0 body-parser: ^1.19.0 butterchurn: ^2.6.7 butterchurn-presets: ^2.4.7 connect-sqlite3: ^0.9.11 csv-string: ^4.0.1 - endb: ^0.22.9 + endb: ^1.3.0 express: ^4.17.1 express-handlebars: ^5.1.0 express-session: ^1.17.1 @@ -1931,4 +1976,5 @@ specifiers: sql: ^0.78.0 sqlite3: ^5.0.0 stream-throttle: ^0.1.3 + tslib: ^2.0.0 ytdl-core: ^3.1.2 From c5394147e375b1fecf52e25fbb6448754177f15f Mon Sep 17 00:00:00 2001 From: aboutDavid <62346025+aboutDavid@users.noreply.github.com> Date: Mon, 20 Jul 2020 15:54:57 -0400 Subject: [PATCH 28/29] Added youtu.be support --- contentHandler.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contentHandler.js b/contentHandler.js index 6b2ef9a..609b8ad 100644 --- a/contentHandler.js +++ b/contentHandler.js @@ -6,7 +6,9 @@ function retrieveStream(identifier) { identifier.startsWith("http://youtube.com") || identifier.startsWith("youtube.com") || identifier.startsWith("https://www.youtube.com") || - identifier.startsWith("http://www.youtube.com") + identifier.startsWith("http://www.youtube.com") || + identifier.startsWith("https://youtu.be") || + identifier.startsWith("http://youtu.be") ) { //return ytdl(identifier, { filter: 'audioonly'}); return ytdl(identifier, { filter: format => format.container === "mp4", highWaterMark: config.inputChunkSize, end: false}); // End: false required to prevent closing From 6c0845ab12c03092c688e433cacc30c91d167613 Mon Sep 17 00:00:00 2001 From: Joe-Biondani <43620787+Joe-Biondani@users.noreply.github.com> Date: Sun, 2 Aug 2020 09:08:57 +0100 Subject: [PATCH 29/29] Update config.js --- config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.js b/config.js index 827feec..68a89a7 100644 --- a/config.js +++ b/config.js @@ -1,7 +1,7 @@ module.exports = { - "brand":"OpenRadio", + "brand":"Radio", "webexports":{ - "display_brand":"OpenRadio" + "display_brand":"Radio" }, "chunkSize": 1024, "inputChunkSize": 1024, @@ -15,4 +15,4 @@ module.exports = { "databasefilename": "sqlite://playlists.db", "authurl":"/admin" } -// Configure names here \ No newline at end of file +// Configure names here

diff --git a/views/playlist_editor.html b/views/playlist_editor.html index d7bc6ef..76a25de 100644 --- a/views/playlist_editor.html +++ b/views/playlist_editor.html @@ -3,7 +3,7 @@

Editing playlist {{playlist_name}}

- Go Back Date: Fri, 10 Jul 2020 22:38:16 +0000 Subject: [PATCH 24/29] Add grid + fix README --- README.md | 14 +++++++------- sessions | Bin 12288 -> 12288 bytes views/admin_playlist.html | 25 ++++++++++++++----------- views/playlists_admin.html | 2 +- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index b83587c..a5f986c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Project URL: https://frill-corn.glitch.me OpenRadio is a system where the admin can create multiple radio stations for users to listen into by inputing youtube urls(defintley going to expand). Everyone listening to hte radio station should be at approximatley the same time as everyone else(last test resulted in 1 to 3 second difference). It comes with a nice admin panel that you can configure the password in. It's also open-source on github(I wouldn't call it openradio if it wasn't) at https://github.com/javaarchive/OpenRadio/tree/glitch You can create a new project from github and configure these values in .env and your OpenRadio instance should be setup. Feel free to delete coding playlist and testing playlist. Make sure to set these values in .env -![image|515x500](upload://5xXblWOJMI3B3Z56OzeIlgOuKW2.png) +![image|515x500](https://aws1.discourse-cdn.com/business6/uploads/glitch/original/2X/2/26e174f9970d1c2934402ddec18e3c629dbbda36.png) You don't need to set `MADE_WITH` but `PASSWORD` is the admin password and `SECRET` is your secret for session cookies. There's also a whole lot more config in `config.js` There are a few annoying bugs and issues which I have described in my latest release: https://github.com/javaarchive/OpenRadio/releases/tag/V2.0.0 @@ -15,14 +15,14 @@ I think I got inspiration when Ben or Electric Reality on discord sent a idea fo # Screenshots -![image|690x348](upload://sbgT6fDQYyrtiF48Pzbee7BGljE.png) +![image|690x348](https://aws1.discourse-cdn.com/business6/uploads/glitch/original/2X/c/c5831337dd3a7a12b81c32bbe372651e43608fb6.png) Control click play button to show audio element -![image|690x224](upload://fpxSIOrR6jevQRTsSgulBPyxf59.png) -![image|690x187](upload://gHTqLip8ht6pg92zrm1El5yvtgm.png) -![image|690x184](upload://sVFESkrpwMiYsiaFh2TZeWavZfN.png) +![image|690x224](https://aws1.discourse-cdn.com/business6/uploads/glitch/optimized/2X/6/6c03e1a21717cd1355edb3018d9482d60ce550f3_2_690x224.png) +![image|690x187](https://aws1.discourse-cdn.com/business6/uploads/glitch/optimized/2X/7/751900a40f395403f8cad076ebf8104c7af87332_2_690x187.png) +![image|690x184](https://aws1.discourse-cdn.com/business6/uploads/glitch/optimized/2X/c/cac1cc48a1a4daa52c0bc2ac85a702ba42c1892f_2_690x184.png) pretty proud of this screen -![image|690x401](upload://b5qgTymjw0M3MNLKxFm61232FXy.png) -![image|690x248](upload://9wln6wcOcOoR9MpjvGBFsluCSf3.png) +![image|690x401](https://aws1.discourse-cdn.com/business6/uploads/glitch/optimized/2X/4/4db4de2291312f62dad7f085d33fd6fc4c7f2130_2_690x401.png) +![image|690x248](https://aws1.discourse-cdn.com/business6/uploads/glitch/original/2X/4/42bb910d85c90fec87be2d5d537739d72a773a0d.png) # Customization diff --git a/sessions b/sessions index 14d1d8e310a5b81537890385cb74be9d85151710..50b8a6029ffed70d830b72648918575408482ad2 100644 GIT binary patch delta 251 zcmZojXh@hK&G>bqj5FicjR{NmxfuEV8TkGA=JL(iSa^qb@+;ZREDQ{c$&(k#sk0bL zYt5TnE3Y{Dt(=6Qxvqgxh>?+%iLsS|g`Tm6$>ihm`j!@^Mg~Sk=BAbmje44_zU)o> zK{;vVrWqbSer6Sk9);$PMnw_fChl2IX8B?6-bLm4PUWVrinu0Bu9H`QnrmntVq|Cq zM26;imX^jqbM+)m49!eTOwEifENZzJfDYon&A@+~e=Gl%&4LQG{FA%&wSdlK@SeO= PUr~)gh1r*pkhPis%g;#V delta 269 zcmZojXh@hK&A4Wwj5Fh!jR{NmxtRFoGVuHJ&E=c3vG5M>kQmbHy~8LYnSP5f^8 z5xF7pu7)WVmWJ-h25wo&=I*J*iDkM*S-~#4uGvoIdhZ-7L53=5np=W^j#6qxL1s~E zv67V%&@=;G12bJCvk(IlD`NvIBcNqw79h(cfpQiGhGr(_hP7M_3=B;CTN(Io^Ka$f hvRP1}mVa`$z7~rrvoF)+o%)JuwkpiNjD(z$0RW17O<({3 diff --git a/views/admin_playlist.html b/views/admin_playlist.html index 9406c17..e91d6fa 100644 --- a/views/admin_playlist.html +++ b/views/admin_playlist.html @@ -1,12 +1,15 @@ -
-
-
{{name}}
-
- {{count}} items in this playlist -
-

- Playlist descriptions are probaly gonna be part of a future update. -

- Edit Playlist + +
+
+
+
{{name}}
+
+ {{count}} items in this playlist +
+

+ Playlist descriptions are probaly gonna be part of a future update. +

+ Edit Playlist +
+
-
diff --git a/views/playlists_admin.html b/views/playlists_admin.html index 9daa574..0f619f2 100644 --- a/views/playlists_admin.html +++ b/views/playlists_admin.html @@ -2,7 +2,7 @@

Showing playlists

-
+
{{{playlists}}}
From 706fe51877fa3c04bd72f959f71f080ce0af5025 Mon Sep 17 00:00:00 2001 From: "Glitch (frill-corn)" Date: Sat, 11 Jul 2020 01:44:34 +0000 Subject: [PATCH 25/29] bug fixes + csv bulk import --- package.json | 6 ++-- server.js | 55 +++++++++++++++++++++++++++---------- sessions | Bin 12288 -> 12288 bytes shrinkwrap.yaml | 8 ++++++ views/admin_playlist.html | 2 +- views/playlist_editor.html | 22 +++++++++++---- 6 files changed, 70 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 46556f9..2966e3d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "//1": "OpenRadio", "//2": "https://docs.npmjs.com/files/package.json", "//3": "updating this file will download and update your packages", - "info":"Type here to reinstall modules in glitch", + "info": "Type here to reinstall modules in glitch", "name": "hello-empowered-express", "version": "0.0.1", "description": "A simple Node app built on Express, instantly up and running.", @@ -27,8 +27,8 @@ "sqlite3": "^4.2.0", "better-sqlite3": "^7.0.1", "butterchurn": "^2.6.7", - "butterchurn-presets": "^2.4.7" - + "butterchurn-presets": "^2.4.7", + "csv-string": "^4.0.1" }, "engines": { "node": "10.x" diff --git a/server.js b/server.js index 967693e..80dcd92 100644 --- a/server.js +++ b/server.js @@ -7,6 +7,8 @@ var session = require("express-session"); const exphbs = require("express-handlebars"); const config = require("./config"); const Endb = require("endb"); +let CSV = require("csv-string"); + var { retrieveStream } = require("./contentHandler"); app.engine(".html", exphbs({ extname: ".html" })); app.set("view engine", ".html"); @@ -102,7 +104,7 @@ app.get("/playlist_editor/:name", async function(req, res) { } res.render(__dirname + "/views/playlist_editor.html", { ...config.webexports, - ...{ playlist_items: output, playlist_name: name } + ...{ playlist_items: output, playlist_name: name, playlist_escapedname: encodeURIComponent(name) } }); } else { req.send("Not a playlist"); @@ -120,19 +122,42 @@ app.post("/playlist_editor/:name", async function(req, res) { } if (await playlists.has(name)) { let playlist = await playlists.get(name); - if (!req.body.new_item_pos || req.body.new_item_pos == "") { - playlist.push({ - name: req.body.item_name, - source: req.body.item_source - }); + if (req.body.action == "singleadd") { + if (!req.body.new_item_pos || req.body.new_item_pos == "") { + playlist.push({ + name: req.body.item_name, + source: req.body.item_source + }); + } else { + playlist.splice(req.body.new_item_pos, 0, { + name: req.body.item_name, + source: req.body.item_source + }); + } } else { - playlist.splice(req.body.new_item_pos, 0, { - name: req.body.item_name, - source: req.body.item_source - }); + if (!req.body.new_item_pos || req.body.new_item_pos == "") { + let lines = CSV.parse(req.body.bulkimportdata) + for (let i = 0; i < lines.length; i++) { + //console.log(lines[i]); + // console.log(lines[i]); + playlist.push({ + name: lines[i][0], + source: lines[i][1] + }); + } + } else { + let lines = req.body.bulkimportdata; + for (let i = 0; i < lines.length; i++) { + let lineData = CSV.parse(lines[i]); + playlist.splice(req.body.new_item_pos, 0, { + name: lineData[0], + source: lineData[1] + }); + } + } } await playlists.set(name, playlist); - res.redirect("/playlist_editor/" + name); + res.redirect("/playlist_editor/" + encodeURIComponent(name)); } else { res.send("Playlist doesn't exist"); } @@ -140,6 +165,7 @@ app.post("/playlist_editor/:name", async function(req, res) { res.send("Please log in"); } }); + app.get("/edit_playlists", async function(req, res) { if (req.session.logintime) { let output = ""; @@ -149,6 +175,7 @@ app.get("/edit_playlists", async function(req, res) { output + admin_playlist_template({ name: all_playlists[i]["key"], + escapedname: encodeURIComponent(all_playlists[i]["key"]), count: all_playlists[i]["value"].length }); } @@ -236,7 +263,7 @@ app.get("/", async (req, res) => { for (var i = 0; i < streams.length; i++) { output = output + - template({ name: streams[i], streamaudiopath: "/stream/" + streams[i] }); + template({ name: streams[i], streamaudiopath: "/stream/" + encodeURIComponent(streams[i]), escapedname: encodeURIComponent(streams[i])}); } //console.log(output); res.render(__dirname + "/views/index.html", { @@ -257,8 +284,8 @@ io.on("connection", function(socket) { idtoplaylist[socket.id] = data.name; socket.join(data.name); socket.emit("itemchange", { - name: playlistToName[idtoplaylist[socket.id]] - }); + name: playlistToName[idtoplaylist[socket.id]] + }); }); socket.on("getcurrentitem", function(data) { try { diff --git a/sessions b/sessions index 50b8a6029ffed70d830b72648918575408482ad2..06dde8d6a0c4056a755fd18ead652273b0d72494 100644 GIT binary patch delta 215 zcmZojXh@hK#l-b%qKp%e+?cS0pNolaE(5q8w>C7PJSi3*`QIcO^?-=y@}s9 zC%`b(ry|oO*|WSL(9^}m!qwH#%g3p*EXg;>+u6ja-1Mi99K+-~c?C^#OCYe&QA({S z$Sg`NRZ!X`QjfHo3C%=;2Y{0<4n9SkQmJE~q<+lRuy3N3Un|~|+md%0+wfvL2^|jO(7#O?> M*~7>%`L@0)0OpQ4{{R30 diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 62a3ef1..b1ba5bd 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -4,6 +4,7 @@ dependencies: butterchurn: 2.6.7 butterchurn-presets: 2.4.7 connect-sqlite3: 0.9.11 + csv-string: 4.0.1 endb: 0.22.9 express: 4.17.1 express-handlebars: 4.0.3 @@ -340,6 +341,12 @@ packages: dev: false resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + /csv-string/4.0.1: + dev: false + engines: + node: '>=12.0' + resolution: + integrity: sha512-nCdK+EWDbqLvZ2MmVQhHTmidMEsHbK3ncgTJb4oguNRpkmH5OOr+KkDRB4nqsVrJ7oK0AdO1QEsBp0+z7KBtGQ== /dashdash/1.14.1: dependencies: assert-plus: 1.0.0 @@ -1880,6 +1887,7 @@ specifiers: butterchurn: ^2.6.7 butterchurn-presets: ^2.4.7 connect-sqlite3: ^0.9.11 + csv-string: ^4.0.1 endb: ^0.22.9 express: ^4.17.1 express-handlebars: ^4.0.3 diff --git a/views/admin_playlist.html b/views/admin_playlist.html index e91d6fa..f1fec99 100644 --- a/views/admin_playlist.html +++ b/views/admin_playlist.html @@ -9,7 +9,7 @@

Playlist descriptions are probaly gonna be part of a future update.

- Edit Playlist + Edit Playlist