nodeJS Port release

This commit is contained in:
Tom Sacher 2018-04-22 18:56:48 +02:00
parent 558ae82a75
commit f3ae81290d
4 changed files with 133 additions and 121 deletions

View file

@ -1,18 +0,0 @@
# EditorConfig is awesome: http://EditorConfig.org
root = true
[*]
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4
charset = utf-8
[*.js]
indent_size = 4
indent_style = space
[*.md]
trim_trailing_whitespace = false

View file

@ -2,28 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a475261a-d91d-4c10-937c-3cde04698029" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/SpeedTest.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.editorconfig" beforeDir="false" afterPath="$PROJECT_DIR$/.editorconfig" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.editorconfig" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/empty.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/example-basic.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/example-basic.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example-chart.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/example-chart.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example-customSettings.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/example-customSettings.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example-customSettings2.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/example-customSettings2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example-gauges.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/example-gauges.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example-pretty.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/example-pretty.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example-progressBar.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/example-progressBar.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example-telemetryEnabled.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/example-telemetryEnabled.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/garbage.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/getIP.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/speedtest_worker.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/speedtest_worker.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/speedtest_worker.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/public/speedtest_worker.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/telemetry.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/telemetry_mysql.sql" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/telemetry_postgresql.sql" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/telemetry_settings.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/SpeedTest.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/SpeedTest.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@ -36,12 +18,12 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="SpeedTest.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/SpeedTest.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="35" column="43" lean-forward="true" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
<state relative-caret-position="417">
<caret line="35" column="43" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
</state>
</provider>
</entry>
@ -57,18 +39,12 @@
</file>
<file leaf-file-name="README.md" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".editorconfig" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="90">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
@ -76,7 +52,7 @@
<file leaf-file-name="example-basic.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/public/example-basic.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<state relative-caret-position="345">
<caret line="23" column="44" selection-start-line="23" selection-start-column="44" selection-end-line="23" selection-end-column="44" />
</state>
</provider>
@ -85,7 +61,7 @@
<file leaf-file-name="speedtest_worker.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/public/speedtest_worker.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7">
<state relative-caret-position="480">
<caret line="37" column="80" selection-start-line="37" selection-start-column="80" selection-end-line="37" selection-end-column="80" />
<folding>
<element signature="n#!!doc" expanded="true" />
@ -94,10 +70,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="example-pretty.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/public/example-pretty.html">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="98">
<state relative-caret-position="1845">
<caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
</state>
</provider>
@ -122,8 +98,8 @@
<option value="$PROJECT_DIR$/src/public/example-basic.html" />
<option value="$PROJECT_DIR$/src/public/example-pretty.html" />
<option value="$PROJECT_DIR$/.editorconfig" />
<option value="$PROJECT_DIR$/src/SpeedTest.js" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/SpeedTest.js" />
<option value="$PROJECT_DIR$/README.md" />
</list>
</option>
@ -143,7 +119,6 @@
</packageJsonPaths>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="1070" />
<option name="y" value="22" />
<option name="width" value="1490" />
<option name="height" value="1021" />
@ -206,34 +181,34 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1524388928332</updated>
<workItem from="1524388930798" duration="2180000" />
<workItem from="1524388930798" duration="3774000" />
<workItem from="1524413899916" duration="1767000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2180000" />
<option name="totallyTimeSpent" value="5541000" />
</component>
<component name="ToolWindowManager">
<frame x="1070" y="22" width="1490" height="1021" extended-state="0" />
<editor active="true" />
<frame x="0" y="22" width="1490" height="1021" extended-state="0" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20217836" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15112321" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32900432" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" weight="0.32792208" />
<window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.32792208" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32900432" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -243,51 +218,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/public/example-basic.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="23" column="44" selection-start-line="23" selection-start-column="44" selection-end-line="23" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/public/example-pretty.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="98">
<caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/empty.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="2" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/public/speedtest_worker.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7">
<caret line="37" column="80" selection-start-line="37" selection-start-column="80" selection-end-line="37" selection-end-column="80" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/garbage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="14" selection-start-line="8" selection-end-line="15" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/SpeedTest.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
@ -303,9 +233,103 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor />
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/public/example-basic.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="23" column="44" selection-start-line="23" selection-start-column="44" selection-end-line="23" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/public/speedtest_worker.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="37" column="80" selection-start-line="37" selection-start-column="80" selection-end-line="37" selection-end-column="80" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1845">
<caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/public/example-basic.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="23" column="44" selection-start-line="23" selection-start-column="44" selection-end-line="23" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1845">
<caret line="123" column="38" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/empty.php" />
<entry file="file://$PROJECT_DIR$/src/public/speedtest_worker.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="37" column="80" selection-start-line="37" selection-start-column="80" selection-end-line="37" selection-end-column="80" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/garbage.php" />
<entry file="file://$PROJECT_DIR$/src/SpeedTest.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="417">
<caret line="35" column="43" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="12" selection-start-column="12" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="15" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="90">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</first_editor>
<second_editor />
</state>
</provider>
<provider editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
<caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
</state>
</provider>
</entry>

View file

@ -2,10 +2,16 @@
This is a s nodeJS Port from [adolfintel's HTML5 Speedtest](https://github.com/adolfintel/speedtest)
## Installation
For any instructions and support please check out the [Wiki](https://github.com/adolfintel/speedtest/wiki)
## License
Copyright (C) 2016-2018 Federico Dossena
Copyright (C) 2018 dunklesToast
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or

View file

@ -31,12 +31,12 @@ Server.get('/garbage', function (req, res) {
if (cache.size === requestedSize) {
res.end(cache.random);
} else {
const size = 1048576 * (req.query.ckSize || 100);
const size = 1048576 * requestedSize;
randomBytes(size, (error, bytes) => {
if (error) res.sendStatus(500);
else {
cache.random = bytes;
cache.size = (req.query.ckSize || 100);
cache.size = requestedSize;
res.end(bytes);
}
})