From 168c18a5dccca0768850a0c9477ef56024fca560 Mon Sep 17 00:00:00 2001 From: Andrey Nikitin Date: Thu, 26 Jun 2025 19:21:55 +0300 Subject: [PATCH 01/48] fixup --- .github/workflows/ci.yml | 13 +- html/index.html | 74 +- html/nouislider/nouislider.css | 304 +++++ html/nouislider/nouislider.js | 2341 ++++++++++++++++++++++++++++++++ html/script.js | 134 +- html/style.css | 109 ++ src/handlers/start.py | 29 +- src/handlers/web_app.py | 13 + src/http_server.py | 39 +- src/main.py | 2 + 10 files changed, 3023 insertions(+), 35 deletions(-) create mode 100644 html/nouislider/nouislider.css create mode 100644 html/nouislider/nouislider.js create mode 100644 html/style.css create mode 100644 src/handlers/web_app.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 123a19e..4036d17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: deploy: runs-on: ubuntu-latest env: # Or as an environment variable - BRANCH: master + BRANCH: html DIRECTORY: /opt/jbond ADDR: ${{ secrets.JBOND_SSH_DOMAIN }} PORT: 8080 @@ -18,6 +18,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 + - name: Set up Python # This is the version of the action for setting up Python, not the Python version. uses: actions/setup-python@v5 @@ -26,11 +27,18 @@ jobs: python-version: '3.x' # Optional - x64 or x86 architecture, defaults to x64 architecture: 'x64' + - name: Set up Python libs run: | python3 -m ensurepip python3 -m venv /opt/certbot/ pip3 install aiogram tomli certbot + + - name: Install some html stuff + run: | + yes | yum install npm + npm install nouislider + - name: install ssh keys # check this thread to understand why its needed: # @@ -39,6 +47,7 @@ jobs: echo "${{ secrets.JBOND_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa cat ~/.ssh/id_rsa ssh-keyscan -H ${{ secrets.JBOND_SSH_HOST }} > ~/.ssh/known_hosts + - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" - name: clone repo @@ -67,8 +76,6 @@ jobs: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '[bot]' >> $DIRECTORY/jbond.toml" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'token = \"${{ secrets.JBOND_BOT_TOKEN }}\"' >> $DIRECTORY/jbond.toml" - # - name: set bot token - # run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo ${{ secrets.JBOND_BOT_TOKEN }} > $DIRECTORY/token" - name: setup service run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $DIRECTORY/misc/jbond.service /usr/lib/systemd/system/" - name: enable service diff --git a/html/index.html b/html/index.html index d1e4aa1..102398e 100644 --- a/html/index.html +++ b/html/index.html @@ -4,15 +4,79 @@ My Telegram Mini App + + + + + - -
- - - +
+ +
+
+ +
+ - +
+ +
+
+
+
+ +
+ +
+
+ +
+ - +
+ +
+
+
+
+ +
+ +
+
+ +
+ - +
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +

+

+ +
+

+ +
+ +
+ + + + \ No newline at end of file diff --git a/html/nouislider/nouislider.css b/html/nouislider/nouislider.css new file mode 100644 index 0000000..fa3523f --- /dev/null +++ b/html/nouislider/nouislider.css @@ -0,0 +1,304 @@ +/* Functional styling; + * These styles are required for noUiSlider to function. + * You don't need to change these rules to apply your design. + */ + .noUi-target, + .noUi-target * { + -webkit-touch-callout: none; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + -webkit-user-select: none; + -ms-touch-action: none; + touch-action: none; + -ms-user-select: none; + -moz-user-select: none; + user-select: none; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .noUi-target { + position: relative; + } + .noUi-base, + .noUi-connects { + width: 100%; + height: 100%; + position: relative; + z-index: 1; + } + /* Wrapper for all connect elements. + */ + .noUi-connects { + overflow: hidden; + z-index: 0; + } + .noUi-connect, + .noUi-origin { + will-change: transform; + position: absolute; + z-index: 1; + top: 0; + right: 0; + height: 100%; + width: 100%; + -ms-transform-origin: 0 0; + -webkit-transform-origin: 0 0; + -webkit-transform-style: preserve-3d; + transform-origin: 0 0; + transform-style: flat; + } + /* Offset direction + */ + .noUi-txt-dir-rtl.noUi-horizontal .noUi-origin { + left: 0; + right: auto; + } + /* Give origins 0 height/width so they don't interfere with clicking the + * connect elements. + */ + .noUi-vertical .noUi-origin { + top: -100%; + width: 0; + } + .noUi-horizontal .noUi-origin { + height: 0; + } + .noUi-handle { + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + position: absolute; + } + .noUi-touch-area { + height: 100%; + width: 100%; + } + .noUi-state-tap .noUi-connect, + .noUi-state-tap .noUi-origin { + -webkit-transition: transform 0.3s; + transition: transform 0.3s; + } + .noUi-state-drag * { + cursor: inherit !important; + } + /* Slider size and handle placement; + */ + .noUi-horizontal { + height: 18px; + } + .noUi-horizontal .noUi-handle { + width: 34px; + height: 28px; + right: -17px; + top: -6px; + } + .noUi-vertical { + width: 18px; + } + .noUi-vertical .noUi-handle { + width: 28px; + height: 34px; + right: -6px; + bottom: -17px; + } + .noUi-txt-dir-rtl.noUi-horizontal .noUi-handle { + left: -17px; + right: auto; + } + /* Styling; + * Giving the connect element a border radius causes issues with using transform: scale + */ + .noUi-target { + background: #FAFAFA; + border-radius: 4px; + border: 1px solid #D3D3D3; + box-shadow: inset 0 1px 1px #F0F0F0, 0 3px 6px -5px #BBB; + } + .noUi-connects { + border-radius: 3px; + } + .noUi-connect { + background: #3FB8AF; + } + /* Handles and cursors; + */ + .noUi-draggable { + cursor: ew-resize; + } + .noUi-vertical .noUi-draggable { + cursor: ns-resize; + } + .noUi-handle { + border: 1px solid #D9D9D9; + border-radius: 3px; + background: #FFF; + cursor: default; + box-shadow: inset 0 0 1px #FFF, inset 0 1px 7px #EBEBEB, 0 3px 6px -3px #BBB; + } + .noUi-active { + box-shadow: inset 0 0 1px #FFF, inset 0 1px 7px #DDD, 0 3px 6px -3px #BBB; + } + /* Handle stripes; + */ + .noUi-handle:before, + .noUi-handle:after { + content: ""; + display: block; + position: absolute; + height: 14px; + width: 1px; + background: #E8E7E6; + left: 14px; + top: 6px; + } + .noUi-handle:after { + left: 17px; + } + .noUi-vertical .noUi-handle:before, + .noUi-vertical .noUi-handle:after { + width: 14px; + height: 1px; + left: 6px; + top: 14px; + } + .noUi-vertical .noUi-handle:after { + top: 17px; + } + /* Disabled state; + */ + [disabled] .noUi-connect { + background: #B8B8B8; + } + [disabled].noUi-target, + [disabled].noUi-handle, + [disabled] .noUi-handle { + cursor: not-allowed; + } + /* Base; + * + */ + .noUi-pips, + .noUi-pips * { + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .noUi-pips { + position: absolute; + color: #999; + } + /* Values; + * + */ + .noUi-value { + position: absolute; + white-space: nowrap; + text-align: center; + } + .noUi-value-sub { + color: #ccc; + font-size: 10px; + } + /* Markings; + * + */ + .noUi-marker { + position: absolute; + background: #CCC; + } + .noUi-marker-sub { + background: #AAA; + } + .noUi-marker-large { + background: #AAA; + } + /* Horizontal layout; + * + */ + .noUi-pips-horizontal { + padding: 10px 0; + height: 80px; + top: 100%; + left: 0; + width: 100%; + } + .noUi-value-horizontal { + -webkit-transform: translate(-50%, 50%); + transform: translate(-50%, 50%); + } + .noUi-rtl .noUi-value-horizontal { + -webkit-transform: translate(50%, 50%); + transform: translate(50%, 50%); + } + .noUi-marker-horizontal.noUi-marker { + margin-left: -1px; + width: 2px; + height: 5px; + } + .noUi-marker-horizontal.noUi-marker-sub { + height: 10px; + } + .noUi-marker-horizontal.noUi-marker-large { + height: 15px; + } + /* Vertical layout; + * + */ + .noUi-pips-vertical { + padding: 0 10px; + height: 100%; + top: 0; + left: 100%; + } + .noUi-value-vertical { + -webkit-transform: translate(0, -50%); + transform: translate(0, -50%); + padding-left: 25px; + } + .noUi-rtl .noUi-value-vertical { + -webkit-transform: translate(0, 50%); + transform: translate(0, 50%); + } + .noUi-marker-vertical.noUi-marker { + width: 5px; + height: 2px; + margin-top: -1px; + } + .noUi-marker-vertical.noUi-marker-sub { + width: 10px; + } + .noUi-marker-vertical.noUi-marker-large { + width: 15px; + } + .noUi-tooltip { + display: block; + position: absolute; + border: 1px solid #D9D9D9; + border-radius: 3px; + background: #fff; + color: #000; + padding: 5px; + text-align: center; + white-space: nowrap; + } + .noUi-horizontal .noUi-tooltip { + -webkit-transform: translate(-50%, 0); + transform: translate(-50%, 0); + left: 50%; + bottom: 120%; + } + .noUi-vertical .noUi-tooltip { + -webkit-transform: translate(0, -50%); + transform: translate(0, -50%); + top: 50%; + right: 120%; + } + .noUi-horizontal .noUi-origin > .noUi-tooltip { + -webkit-transform: translate(50%, 0); + transform: translate(50%, 0); + left: auto; + bottom: 10px; + } + .noUi-vertical .noUi-origin > .noUi-tooltip { + -webkit-transform: translate(0, -18px); + transform: translate(0, -18px); + top: auto; + right: 28px; + } diff --git a/html/nouislider/nouislider.js b/html/nouislider/nouislider.js new file mode 100644 index 0000000..2d3e054 --- /dev/null +++ b/html/nouislider/nouislider.js @@ -0,0 +1,2341 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) : + typeof define === 'function' && define.amd ? define(['exports'], factory) : + (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.noUiSlider = {})); +})(this, (function (exports) { 'use strict'; + + exports.PipsMode = void 0; + (function (PipsMode) { + PipsMode["Range"] = "range"; + PipsMode["Steps"] = "steps"; + PipsMode["Positions"] = "positions"; + PipsMode["Count"] = "count"; + PipsMode["Values"] = "values"; + })(exports.PipsMode || (exports.PipsMode = {})); + exports.PipsType = void 0; + (function (PipsType) { + PipsType[PipsType["None"] = -1] = "None"; + PipsType[PipsType["NoValue"] = 0] = "NoValue"; + PipsType[PipsType["LargeValue"] = 1] = "LargeValue"; + PipsType[PipsType["SmallValue"] = 2] = "SmallValue"; + })(exports.PipsType || (exports.PipsType = {})); + //region Helper Methods + function isValidFormatter(entry) { + return isValidPartialFormatter(entry) && typeof entry.from === "function"; + } + function isValidPartialFormatter(entry) { + // partial formatters only need a to function and not a from function + return typeof entry === "object" && typeof entry.to === "function"; + } + function removeElement(el) { + el.parentElement.removeChild(el); + } + function isSet(value) { + return value !== null && value !== undefined; + } + // Bindable version + function preventDefault(e) { + e.preventDefault(); + } + // Removes duplicates from an array. + function unique(array) { + return array.filter(function (a) { + return !this[a] ? (this[a] = true) : false; + }, {}); + } + // Round a value to the closest 'to'. + function closest(value, to) { + return Math.round(value / to) * to; + } + // Current position of an element relative to the document. + function offset(elem, orientation) { + var rect = elem.getBoundingClientRect(); + var doc = elem.ownerDocument; + var docElem = doc.documentElement; + var pageOffset = getPageOffset(doc); + // getBoundingClientRect contains left scroll in Chrome on Android. + // I haven't found a feature detection that proves this. Worst case + // scenario on mis-match: the 'tap' feature on horizontal sliders breaks. + if (/webkit.*Chrome.*Mobile/i.test(navigator.userAgent)) { + pageOffset.x = 0; + } + return orientation ? rect.top + pageOffset.y - docElem.clientTop : rect.left + pageOffset.x - docElem.clientLeft; + } + // Checks whether a value is numerical. + function isNumeric(a) { + return typeof a === "number" && !isNaN(a) && isFinite(a); + } + // Sets a class and removes it after [duration] ms. + function addClassFor(element, className, duration) { + if (duration > 0) { + addClass(element, className); + setTimeout(function () { + removeClass(element, className); + }, duration); + } + } + // Limits a value to 0 - 100 + function limit(a) { + return Math.max(Math.min(a, 100), 0); + } + // Wraps a variable as an array, if it isn't one yet. + // Note that an input array is returned by reference! + function asArray(a) { + return Array.isArray(a) ? a : [a]; + } + // Counts decimals + function countDecimals(numStr) { + numStr = String(numStr); + var pieces = numStr.split("."); + return pieces.length > 1 ? pieces[1].length : 0; + } + // http://youmightnotneedjquery.com/#add_class + function addClass(el, className) { + if (el.classList && !/\s/.test(className)) { + el.classList.add(className); + } + else { + el.className += " " + className; + } + } + // http://youmightnotneedjquery.com/#remove_class + function removeClass(el, className) { + if (el.classList && !/\s/.test(className)) { + el.classList.remove(className); + } + else { + el.className = el.className.replace(new RegExp("(^|\\b)" + className.split(" ").join("|") + "(\\b|$)", "gi"), " "); + } + } + // https://plainjs.com/javascript/attributes/adding-removing-and-testing-for-classes-9/ + function hasClass(el, className) { + return el.classList ? el.classList.contains(className) : new RegExp("\\b" + className + "\\b").test(el.className); + } + // https://developer.mozilla.org/en-US/docs/Web/API/Window/scrollY#Notes + function getPageOffset(doc) { + var supportPageOffset = window.pageXOffset !== undefined; + var isCSS1Compat = (doc.compatMode || "") === "CSS1Compat"; + var x = supportPageOffset + ? window.pageXOffset + : isCSS1Compat + ? doc.documentElement.scrollLeft + : doc.body.scrollLeft; + var y = supportPageOffset + ? window.pageYOffset + : isCSS1Compat + ? doc.documentElement.scrollTop + : doc.body.scrollTop; + return { + x: x, + y: y, + }; + } + // we provide a function to compute constants instead + // of accessing window.* as soon as the module needs it + // so that we do not compute anything if not needed + function getActions() { + // Determine the events to bind. IE11 implements pointerEvents without + // a prefix, which breaks compatibility with the IE10 implementation. + return window.navigator.pointerEnabled + ? { + start: "pointerdown", + move: "pointermove", + end: "pointerup", + } + : window.navigator.msPointerEnabled + ? { + start: "MSPointerDown", + move: "MSPointerMove", + end: "MSPointerUp", + } + : { + start: "mousedown touchstart", + move: "mousemove touchmove", + end: "mouseup touchend", + }; + } + // https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md + // Issue #785 + function getSupportsPassive() { + var supportsPassive = false; + /* eslint-disable */ + try { + var opts = Object.defineProperty({}, "passive", { + get: function () { + supportsPassive = true; + }, + }); + // @ts-ignore + window.addEventListener("test", null, opts); + } + catch (e) { } + /* eslint-enable */ + return supportsPassive; + } + function getSupportsTouchActionNone() { + return window.CSS && CSS.supports && CSS.supports("touch-action", "none"); + } + //endregion + //region Range Calculation + // Determine the size of a sub-range in relation to a full range. + function subRangeRatio(pa, pb) { + return 100 / (pb - pa); + } + // (percentage) How many percent is this value of this range? + function fromPercentage(range, value, startRange) { + return (value * 100) / (range[startRange + 1] - range[startRange]); + } + // (percentage) Where is this value on this range? + function toPercentage(range, value) { + return fromPercentage(range, range[0] < 0 ? value + Math.abs(range[0]) : value - range[0], 0); + } + // (value) How much is this percentage on this range? + function isPercentage(range, value) { + return (value * (range[1] - range[0])) / 100 + range[0]; + } + function getJ(value, arr) { + var j = 1; + while (value >= arr[j]) { + j += 1; + } + return j; + } + // (percentage) Input a value, find where, on a scale of 0-100, it applies. + function toStepping(xVal, xPct, value) { + if (value >= xVal.slice(-1)[0]) { + return 100; + } + var j = getJ(value, xVal); + var va = xVal[j - 1]; + var vb = xVal[j]; + var pa = xPct[j - 1]; + var pb = xPct[j]; + return pa + toPercentage([va, vb], value) / subRangeRatio(pa, pb); + } + // (value) Input a percentage, find where it is on the specified range. + function fromStepping(xVal, xPct, value) { + // There is no range group that fits 100 + if (value >= 100) { + return xVal.slice(-1)[0]; + } + var j = getJ(value, xPct); + var va = xVal[j - 1]; + var vb = xVal[j]; + var pa = xPct[j - 1]; + var pb = xPct[j]; + return isPercentage([va, vb], (value - pa) * subRangeRatio(pa, pb)); + } + // (percentage) Get the step that applies at a certain value. + function getStep(xPct, xSteps, snap, value) { + if (value === 100) { + return value; + } + var j = getJ(value, xPct); + var a = xPct[j - 1]; + var b = xPct[j]; + // If 'snap' is set, steps are used as fixed points on the slider. + if (snap) { + // Find the closest position, a or b. + if (value - a > (b - a) / 2) { + return b; + } + return a; + } + if (!xSteps[j - 1]) { + return value; + } + return xPct[j - 1] + closest(value - xPct[j - 1], xSteps[j - 1]); + } + //endregion + //region Spectrum + var Spectrum = /** @class */ (function () { + function Spectrum(entry, snap, singleStep) { + this.xPct = []; + this.xVal = []; + this.xSteps = []; + this.xNumSteps = []; + this.xHighestCompleteStep = []; + this.xSteps = [singleStep || false]; + this.xNumSteps = [false]; + this.snap = snap; + var index; + var ordered = []; + // Map the object keys to an array. + Object.keys(entry).forEach(function (index) { + ordered.push([asArray(entry[index]), index]); + }); + // Sort all entries by value (numeric sort). + ordered.sort(function (a, b) { + return a[0][0] - b[0][0]; + }); + // Convert all entries to subranges. + for (index = 0; index < ordered.length; index++) { + this.handleEntryPoint(ordered[index][1], ordered[index][0]); + } + // Store the actual step values. + // xSteps is sorted in the same order as xPct and xVal. + this.xNumSteps = this.xSteps.slice(0); + // Convert all numeric steps to the percentage of the subrange they represent. + for (index = 0; index < this.xNumSteps.length; index++) { + this.handleStepPoint(index, this.xNumSteps[index]); + } + } + Spectrum.prototype.getDistance = function (value) { + var distances = []; + for (var index = 0; index < this.xNumSteps.length - 1; index++) { + distances[index] = fromPercentage(this.xVal, value, index); + } + return distances; + }; + // Calculate the percentual distance over the whole scale of ranges. + // direction: 0 = backwards / 1 = forwards + Spectrum.prototype.getAbsoluteDistance = function (value, distances, direction) { + var xPct_index = 0; + // Calculate range where to start calculation + if (value < this.xPct[this.xPct.length - 1]) { + while (value > this.xPct[xPct_index + 1]) { + xPct_index++; + } + } + else if (value === this.xPct[this.xPct.length - 1]) { + xPct_index = this.xPct.length - 2; + } + // If looking backwards and the value is exactly at a range separator then look one range further + if (!direction && value === this.xPct[xPct_index + 1]) { + xPct_index++; + } + if (distances === null) { + distances = []; + } + var start_factor; + var rest_factor = 1; + var rest_rel_distance = distances[xPct_index]; + var range_pct = 0; + var rel_range_distance = 0; + var abs_distance_counter = 0; + var range_counter = 0; + // Calculate what part of the start range the value is + if (direction) { + start_factor = (value - this.xPct[xPct_index]) / (this.xPct[xPct_index + 1] - this.xPct[xPct_index]); + } + else { + start_factor = (this.xPct[xPct_index + 1] - value) / (this.xPct[xPct_index + 1] - this.xPct[xPct_index]); + } + // Do until the complete distance across ranges is calculated + while (rest_rel_distance > 0) { + // Calculate the percentage of total range + range_pct = this.xPct[xPct_index + 1 + range_counter] - this.xPct[xPct_index + range_counter]; + // Detect if the margin, padding or limit is larger then the current range and calculate + if (distances[xPct_index + range_counter] * rest_factor + 100 - start_factor * 100 > 100) { + // If larger then take the percentual distance of the whole range + rel_range_distance = range_pct * start_factor; + // Rest factor of relative percentual distance still to be calculated + rest_factor = (rest_rel_distance - 100 * start_factor) / distances[xPct_index + range_counter]; + // Set start factor to 1 as for next range it does not apply. + start_factor = 1; + } + else { + // If smaller or equal then take the percentual distance of the calculate percentual part of that range + rel_range_distance = ((distances[xPct_index + range_counter] * range_pct) / 100) * rest_factor; + // No rest left as the rest fits in current range + rest_factor = 0; + } + if (direction) { + abs_distance_counter = abs_distance_counter - rel_range_distance; + // Limit range to first range when distance becomes outside of minimum range + if (this.xPct.length + range_counter >= 1) { + range_counter--; + } + } + else { + abs_distance_counter = abs_distance_counter + rel_range_distance; + // Limit range to last range when distance becomes outside of maximum range + if (this.xPct.length - range_counter >= 1) { + range_counter++; + } + } + // Rest of relative percentual distance still to be calculated + rest_rel_distance = distances[xPct_index + range_counter] * rest_factor; + } + return value + abs_distance_counter; + }; + Spectrum.prototype.toStepping = function (value) { + value = toStepping(this.xVal, this.xPct, value); + return value; + }; + Spectrum.prototype.fromStepping = function (value) { + return fromStepping(this.xVal, this.xPct, value); + }; + Spectrum.prototype.getStep = function (value) { + value = getStep(this.xPct, this.xSteps, this.snap, value); + return value; + }; + Spectrum.prototype.getDefaultStep = function (value, isDown, size) { + var j = getJ(value, this.xPct); + // When at the top or stepping down, look at the previous sub-range + if (value === 100 || (isDown && value === this.xPct[j - 1])) { + j = Math.max(j - 1, 1); + } + return (this.xVal[j] - this.xVal[j - 1]) / size; + }; + Spectrum.prototype.getNearbySteps = function (value) { + var j = getJ(value, this.xPct); + return { + stepBefore: { + startValue: this.xVal[j - 2], + step: this.xNumSteps[j - 2], + highestStep: this.xHighestCompleteStep[j - 2], + }, + thisStep: { + startValue: this.xVal[j - 1], + step: this.xNumSteps[j - 1], + highestStep: this.xHighestCompleteStep[j - 1], + }, + stepAfter: { + startValue: this.xVal[j], + step: this.xNumSteps[j], + highestStep: this.xHighestCompleteStep[j], + }, + }; + }; + Spectrum.prototype.countStepDecimals = function () { + var stepDecimals = this.xNumSteps.map(countDecimals); + return Math.max.apply(null, stepDecimals); + }; + Spectrum.prototype.hasNoSize = function () { + return this.xVal[0] === this.xVal[this.xVal.length - 1]; + }; + // Outside testing + Spectrum.prototype.convert = function (value) { + return this.getStep(this.toStepping(value)); + }; + Spectrum.prototype.handleEntryPoint = function (index, value) { + var percentage; + // Covert min/max syntax to 0 and 100. + if (index === "min") { + percentage = 0; + } + else if (index === "max") { + percentage = 100; + } + else { + percentage = parseFloat(index); + } + // Check for correct input. + if (!isNumeric(percentage) || !isNumeric(value[0])) { + throw new Error("noUiSlider: 'range' value isn't numeric."); + } + // Store values. + this.xPct.push(percentage); + this.xVal.push(value[0]); + var value1 = Number(value[1]); + // NaN will evaluate to false too, but to keep + // logging clear, set step explicitly. Make sure + // not to override the 'step' setting with false. + if (!percentage) { + if (!isNaN(value1)) { + this.xSteps[0] = value1; + } + } + else { + this.xSteps.push(isNaN(value1) ? false : value1); + } + this.xHighestCompleteStep.push(0); + }; + Spectrum.prototype.handleStepPoint = function (i, n) { + // Ignore 'false' stepping. + if (!n) { + return; + } + // Step over zero-length ranges (#948); + if (this.xVal[i] === this.xVal[i + 1]) { + this.xSteps[i] = this.xHighestCompleteStep[i] = this.xVal[i]; + return; + } + // Factor to range ratio + this.xSteps[i] = + fromPercentage([this.xVal[i], this.xVal[i + 1]], n, 0) / subRangeRatio(this.xPct[i], this.xPct[i + 1]); + var totalSteps = (this.xVal[i + 1] - this.xVal[i]) / this.xNumSteps[i]; + var highestStep = Math.ceil(Number(totalSteps.toFixed(3)) - 1); + var step = this.xVal[i] + this.xNumSteps[i] * highestStep; + this.xHighestCompleteStep[i] = step; + }; + return Spectrum; + }()); + //endregion + //region Options + /* Every input option is tested and parsed. This will prevent + endless validation in internal methods. These tests are + structured with an item for every option available. An + option can be marked as required by setting the 'r' flag. + The testing function is provided with three arguments: + - The provided value for the option; + - A reference to the options object; + - The name for the option; + + The testing function returns false when an error is detected, + or true when everything is OK. It can also modify the option + object, to make sure all values can be correctly looped elsewhere. */ + //region Defaults + var defaultFormatter = { + to: function (value) { + return value === undefined ? "" : value.toFixed(2); + }, + from: Number, + }; + var cssClasses = { + target: "target", + base: "base", + origin: "origin", + handle: "handle", + handleLower: "handle-lower", + handleUpper: "handle-upper", + touchArea: "touch-area", + horizontal: "horizontal", + vertical: "vertical", + background: "background", + connect: "connect", + connects: "connects", + ltr: "ltr", + rtl: "rtl", + textDirectionLtr: "txt-dir-ltr", + textDirectionRtl: "txt-dir-rtl", + draggable: "draggable", + drag: "state-drag", + tap: "state-tap", + active: "active", + tooltip: "tooltip", + pips: "pips", + pipsHorizontal: "pips-horizontal", + pipsVertical: "pips-vertical", + marker: "marker", + markerHorizontal: "marker-horizontal", + markerVertical: "marker-vertical", + markerNormal: "marker-normal", + markerLarge: "marker-large", + markerSub: "marker-sub", + value: "value", + valueHorizontal: "value-horizontal", + valueVertical: "value-vertical", + valueNormal: "value-normal", + valueLarge: "value-large", + valueSub: "value-sub", + }; + // Namespaces of internal event listeners + var INTERNAL_EVENT_NS = { + tooltips: ".__tooltips", + aria: ".__aria", + }; + //endregion + function testStep(parsed, entry) { + if (!isNumeric(entry)) { + throw new Error("noUiSlider: 'step' is not numeric."); + } + // The step option can still be used to set stepping + // for linear sliders. Overwritten if set in 'range'. + parsed.singleStep = entry; + } + function testKeyboardPageMultiplier(parsed, entry) { + if (!isNumeric(entry)) { + throw new Error("noUiSlider: 'keyboardPageMultiplier' is not numeric."); + } + parsed.keyboardPageMultiplier = entry; + } + function testKeyboardMultiplier(parsed, entry) { + if (!isNumeric(entry)) { + throw new Error("noUiSlider: 'keyboardMultiplier' is not numeric."); + } + parsed.keyboardMultiplier = entry; + } + function testKeyboardDefaultStep(parsed, entry) { + if (!isNumeric(entry)) { + throw new Error("noUiSlider: 'keyboardDefaultStep' is not numeric."); + } + parsed.keyboardDefaultStep = entry; + } + function testRange(parsed, entry) { + // Filter incorrect input. + if (typeof entry !== "object" || Array.isArray(entry)) { + throw new Error("noUiSlider: 'range' is not an object."); + } + // Catch missing start or end. + if (entry.min === undefined || entry.max === undefined) { + throw new Error("noUiSlider: Missing 'min' or 'max' in 'range'."); + } + parsed.spectrum = new Spectrum(entry, parsed.snap || false, parsed.singleStep); + } + function testStart(parsed, entry) { + entry = asArray(entry); + // Validate input. Values aren't tested, as the public .val method + // will always provide a valid location. + if (!Array.isArray(entry) || !entry.length) { + throw new Error("noUiSlider: 'start' option is incorrect."); + } + // Store the number of handles. + parsed.handles = entry.length; + // When the slider is initialized, the .val method will + // be called with the start options. + parsed.start = entry; + } + function testSnap(parsed, entry) { + if (typeof entry !== "boolean") { + throw new Error("noUiSlider: 'snap' option must be a boolean."); + } + // Enforce 100% stepping within subranges. + parsed.snap = entry; + } + function testAnimate(parsed, entry) { + if (typeof entry !== "boolean") { + throw new Error("noUiSlider: 'animate' option must be a boolean."); + } + // Enforce 100% stepping within subranges. + parsed.animate = entry; + } + function testAnimationDuration(parsed, entry) { + if (typeof entry !== "number") { + throw new Error("noUiSlider: 'animationDuration' option must be a number."); + } + parsed.animationDuration = entry; + } + function testConnect(parsed, entry) { + var connect = [false]; + var i; + // Map legacy options + if (entry === "lower") { + entry = [true, false]; + } + else if (entry === "upper") { + entry = [false, true]; + } + // Handle boolean options + if (entry === true || entry === false) { + for (i = 1; i < parsed.handles; i++) { + connect.push(entry); + } + connect.push(false); + } + // Reject invalid input + else if (!Array.isArray(entry) || !entry.length || entry.length !== parsed.handles + 1) { + throw new Error("noUiSlider: 'connect' option doesn't match handle count."); + } + else { + connect = entry; + } + parsed.connect = connect; + } + function testOrientation(parsed, entry) { + // Set orientation to an a numerical value for easy + // array selection. + switch (entry) { + case "horizontal": + parsed.ort = 0; + break; + case "vertical": + parsed.ort = 1; + break; + default: + throw new Error("noUiSlider: 'orientation' option is invalid."); + } + } + function testMargin(parsed, entry) { + if (!isNumeric(entry)) { + throw new Error("noUiSlider: 'margin' option must be numeric."); + } + // Issue #582 + if (entry === 0) { + return; + } + parsed.margin = parsed.spectrum.getDistance(entry); + } + function testLimit(parsed, entry) { + if (!isNumeric(entry)) { + throw new Error("noUiSlider: 'limit' option must be numeric."); + } + parsed.limit = parsed.spectrum.getDistance(entry); + if (!parsed.limit || parsed.handles < 2) { + throw new Error("noUiSlider: 'limit' option is only supported on linear sliders with 2 or more handles."); + } + } + function testPadding(parsed, entry) { + var index; + if (!isNumeric(entry) && !Array.isArray(entry)) { + throw new Error("noUiSlider: 'padding' option must be numeric or array of exactly 2 numbers."); + } + if (Array.isArray(entry) && !(entry.length === 2 || isNumeric(entry[0]) || isNumeric(entry[1]))) { + throw new Error("noUiSlider: 'padding' option must be numeric or array of exactly 2 numbers."); + } + if (entry === 0) { + return; + } + if (!Array.isArray(entry)) { + entry = [entry, entry]; + } + // 'getDistance' returns false for invalid values. + parsed.padding = [parsed.spectrum.getDistance(entry[0]), parsed.spectrum.getDistance(entry[1])]; + for (index = 0; index < parsed.spectrum.xNumSteps.length - 1; index++) { + // last "range" can't contain step size as it is purely an endpoint. + if (parsed.padding[0][index] < 0 || parsed.padding[1][index] < 0) { + throw new Error("noUiSlider: 'padding' option must be a positive number(s)."); + } + } + var totalPadding = entry[0] + entry[1]; + var firstValue = parsed.spectrum.xVal[0]; + var lastValue = parsed.spectrum.xVal[parsed.spectrum.xVal.length - 1]; + if (totalPadding / (lastValue - firstValue) > 1) { + throw new Error("noUiSlider: 'padding' option must not exceed 100% of the range."); + } + } + function testDirection(parsed, entry) { + // Set direction as a numerical value for easy parsing. + // Invert connection for RTL sliders, so that the proper + // handles get the connect/background classes. + switch (entry) { + case "ltr": + parsed.dir = 0; + break; + case "rtl": + parsed.dir = 1; + break; + default: + throw new Error("noUiSlider: 'direction' option was not recognized."); + } + } + function testBehaviour(parsed, entry) { + // Make sure the input is a string. + if (typeof entry !== "string") { + throw new Error("noUiSlider: 'behaviour' must be a string containing options."); + } + // Check if the string contains any keywords. + // None are required. + var tap = entry.indexOf("tap") >= 0; + var drag = entry.indexOf("drag") >= 0; + var fixed = entry.indexOf("fixed") >= 0; + var snap = entry.indexOf("snap") >= 0; + var hover = entry.indexOf("hover") >= 0; + var unconstrained = entry.indexOf("unconstrained") >= 0; + var invertConnects = entry.indexOf("invert-connects") >= 0; + var dragAll = entry.indexOf("drag-all") >= 0; + var smoothSteps = entry.indexOf("smooth-steps") >= 0; + if (fixed) { + if (parsed.handles !== 2) { + throw new Error("noUiSlider: 'fixed' behaviour must be used with 2 handles"); + } + // Use margin to enforce fixed state + testMargin(parsed, parsed.start[1] - parsed.start[0]); + } + if (invertConnects && parsed.handles !== 2) { + throw new Error("noUiSlider: 'invert-connects' behaviour must be used with 2 handles"); + } + if (unconstrained && (parsed.margin || parsed.limit)) { + throw new Error("noUiSlider: 'unconstrained' behaviour cannot be used with margin or limit"); + } + parsed.events = { + tap: tap || snap, + drag: drag, + dragAll: dragAll, + smoothSteps: smoothSteps, + fixed: fixed, + snap: snap, + hover: hover, + unconstrained: unconstrained, + invertConnects: invertConnects, + }; + } + function testTooltips(parsed, entry) { + if (entry === false) { + return; + } + if (entry === true || isValidPartialFormatter(entry)) { + parsed.tooltips = []; + for (var i = 0; i < parsed.handles; i++) { + parsed.tooltips.push(entry); + } + } + else { + entry = asArray(entry); + if (entry.length !== parsed.handles) { + throw new Error("noUiSlider: must pass a formatter for all handles."); + } + entry.forEach(function (formatter) { + if (typeof formatter !== "boolean" && !isValidPartialFormatter(formatter)) { + throw new Error("noUiSlider: 'tooltips' must be passed a formatter or 'false'."); + } + }); + parsed.tooltips = entry; + } + } + function testHandleAttributes(parsed, entry) { + if (entry.length !== parsed.handles) { + throw new Error("noUiSlider: must pass a attributes for all handles."); + } + parsed.handleAttributes = entry; + } + function testAriaFormat(parsed, entry) { + if (!isValidPartialFormatter(entry)) { + throw new Error("noUiSlider: 'ariaFormat' requires 'to' method."); + } + parsed.ariaFormat = entry; + } + function testFormat(parsed, entry) { + if (!isValidFormatter(entry)) { + throw new Error("noUiSlider: 'format' requires 'to' and 'from' methods."); + } + parsed.format = entry; + } + function testKeyboardSupport(parsed, entry) { + if (typeof entry !== "boolean") { + throw new Error("noUiSlider: 'keyboardSupport' option must be a boolean."); + } + parsed.keyboardSupport = entry; + } + function testDocumentElement(parsed, entry) { + // This is an advanced option. Passed values are used without validation. + parsed.documentElement = entry; + } + function testCssPrefix(parsed, entry) { + if (typeof entry !== "string" && entry !== false) { + throw new Error("noUiSlider: 'cssPrefix' must be a string or `false`."); + } + parsed.cssPrefix = entry; + } + function testCssClasses(parsed, entry) { + if (typeof entry !== "object") { + throw new Error("noUiSlider: 'cssClasses' must be an object."); + } + if (typeof parsed.cssPrefix === "string") { + parsed.cssClasses = {}; + Object.keys(entry).forEach(function (key) { + parsed.cssClasses[key] = parsed.cssPrefix + entry[key]; + }); + } + else { + parsed.cssClasses = entry; + } + } + // Test all developer settings and parse to assumption-safe values. + function testOptions(options) { + // To prove a fix for #537, freeze options here. + // If the object is modified, an error will be thrown. + // Object.freeze(options); + var parsed = { + margin: null, + limit: null, + padding: null, + animate: true, + animationDuration: 300, + ariaFormat: defaultFormatter, + format: defaultFormatter, + }; + // Tests are executed in the order they are presented here. + var tests = { + step: { r: false, t: testStep }, + keyboardPageMultiplier: { r: false, t: testKeyboardPageMultiplier }, + keyboardMultiplier: { r: false, t: testKeyboardMultiplier }, + keyboardDefaultStep: { r: false, t: testKeyboardDefaultStep }, + start: { r: true, t: testStart }, + connect: { r: true, t: testConnect }, + direction: { r: true, t: testDirection }, + snap: { r: false, t: testSnap }, + animate: { r: false, t: testAnimate }, + animationDuration: { r: false, t: testAnimationDuration }, + range: { r: true, t: testRange }, + orientation: { r: false, t: testOrientation }, + margin: { r: false, t: testMargin }, + limit: { r: false, t: testLimit }, + padding: { r: false, t: testPadding }, + behaviour: { r: true, t: testBehaviour }, + ariaFormat: { r: false, t: testAriaFormat }, + format: { r: false, t: testFormat }, + tooltips: { r: false, t: testTooltips }, + keyboardSupport: { r: true, t: testKeyboardSupport }, + documentElement: { r: false, t: testDocumentElement }, + cssPrefix: { r: true, t: testCssPrefix }, + cssClasses: { r: true, t: testCssClasses }, + handleAttributes: { r: false, t: testHandleAttributes }, + }; + var defaults = { + connect: false, + direction: "ltr", + behaviour: "tap", + orientation: "horizontal", + keyboardSupport: true, + cssPrefix: "noUi-", + cssClasses: cssClasses, + keyboardPageMultiplier: 5, + keyboardMultiplier: 1, + keyboardDefaultStep: 10, + }; + // AriaFormat defaults to regular format, if any. + if (options.format && !options.ariaFormat) { + options.ariaFormat = options.format; + } + // Run all options through a testing mechanism to ensure correct + // input. It should be noted that options might get modified to + // be handled properly. E.g. wrapping integers in arrays. + Object.keys(tests).forEach(function (name) { + // If the option isn't set, but it is required, throw an error. + if (!isSet(options[name]) && defaults[name] === undefined) { + if (tests[name].r) { + throw new Error("noUiSlider: '" + name + "' is required."); + } + return; + } + tests[name].t(parsed, !isSet(options[name]) ? defaults[name] : options[name]); + }); + // Forward pips options + parsed.pips = options.pips; + // All recent browsers accept unprefixed transform. + // We need -ms- for IE9 and -webkit- for older Android; + // Assume use of -webkit- if unprefixed and -ms- are not supported. + // https://caniuse.com/#feat=transforms2d + var d = document.createElement("div"); + var msPrefix = d.style.msTransform !== undefined; + var noPrefix = d.style.transform !== undefined; + parsed.transformRule = noPrefix ? "transform" : msPrefix ? "msTransform" : "webkitTransform"; + // Pips don't move, so we can place them using left/top. + var styles = [ + ["left", "top"], + ["right", "bottom"], + ]; + parsed.style = styles[parsed.dir][parsed.ort]; + return parsed; + } + //endregion + function scope(target, options, originalOptions) { + var actions = getActions(); + var supportsTouchActionNone = getSupportsTouchActionNone(); + var supportsPassive = supportsTouchActionNone && getSupportsPassive(); + // All variables local to 'scope' are prefixed with 'scope_' + // Slider DOM Nodes + var scope_Target = target; + var scope_Base; + var scope_ConnectBase; + var scope_Handles; + var scope_Connects; + var scope_Pips; + var scope_Tooltips; + // Slider state values + var scope_Spectrum = options.spectrum; + var scope_Values = []; + var scope_Locations = []; + var scope_HandleNumbers = []; + var scope_ActiveHandlesCount = 0; + var scope_Events = {}; + var scope_ConnectsInverted = false; + // Document Nodes + var scope_Document = target.ownerDocument; + var scope_DocumentElement = options.documentElement || scope_Document.documentElement; + var scope_Body = scope_Document.body; + // For horizontal sliders in standard ltr documents, + // make .noUi-origin overflow to the left so the document doesn't scroll. + var scope_DirOffset = scope_Document.dir === "rtl" || options.ort === 1 ? 0 : 100; + // Creates a node, adds it to target, returns the new node. + function addNodeTo(addTarget, className) { + var div = scope_Document.createElement("div"); + if (className) { + addClass(div, className); + } + addTarget.appendChild(div); + return div; + } + // Append a origin to the base + function addOrigin(base, handleNumber) { + var origin = addNodeTo(base, options.cssClasses.origin); + var handle = addNodeTo(origin, options.cssClasses.handle); + addNodeTo(handle, options.cssClasses.touchArea); + handle.setAttribute("data-handle", String(handleNumber)); + if (options.keyboardSupport) { + // https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/tabindex + // 0 = focusable and reachable + handle.setAttribute("tabindex", "0"); + handle.addEventListener("keydown", function (event) { + return eventKeydown(event, handleNumber); + }); + } + if (options.handleAttributes !== undefined) { + var attributes_1 = options.handleAttributes[handleNumber]; + Object.keys(attributes_1).forEach(function (attribute) { + handle.setAttribute(attribute, attributes_1[attribute]); + }); + } + handle.setAttribute("role", "slider"); + handle.setAttribute("aria-orientation", options.ort ? "vertical" : "horizontal"); + if (handleNumber === 0) { + addClass(handle, options.cssClasses.handleLower); + } + else if (handleNumber === options.handles - 1) { + addClass(handle, options.cssClasses.handleUpper); + } + origin.handle = handle; + return origin; + } + // Insert nodes for connect elements + function addConnect(base, add) { + if (!add) { + return false; + } + return addNodeTo(base, options.cssClasses.connect); + } + // Add handles to the slider base. + function addElements(connectOptions, base) { + scope_ConnectBase = addNodeTo(base, options.cssClasses.connects); + scope_Handles = []; + scope_Connects = []; + scope_Connects.push(addConnect(scope_ConnectBase, connectOptions[0])); + // [::::O====O====O====] + // connectOptions = [0, 1, 1, 1] + for (var i = 0; i < options.handles; i++) { + // Keep a list of all added handles. + scope_Handles.push(addOrigin(base, i)); + scope_HandleNumbers[i] = i; + scope_Connects.push(addConnect(scope_ConnectBase, connectOptions[i + 1])); + } + } + // Initialize a single slider. + function addSlider(addTarget) { + // Apply classes and data to the target. + addClass(addTarget, options.cssClasses.target); + if (options.dir === 0) { + addClass(addTarget, options.cssClasses.ltr); + } + else { + addClass(addTarget, options.cssClasses.rtl); + } + if (options.ort === 0) { + addClass(addTarget, options.cssClasses.horizontal); + } + else { + addClass(addTarget, options.cssClasses.vertical); + } + var textDirection = getComputedStyle(addTarget).direction; + if (textDirection === "rtl") { + addClass(addTarget, options.cssClasses.textDirectionRtl); + } + else { + addClass(addTarget, options.cssClasses.textDirectionLtr); + } + return addNodeTo(addTarget, options.cssClasses.base); + } + function addTooltip(handle, handleNumber) { + if (!options.tooltips || !options.tooltips[handleNumber]) { + return false; + } + return addNodeTo(handle.firstChild, options.cssClasses.tooltip); + } + function isSliderDisabled() { + return scope_Target.hasAttribute("disabled"); + } + // Disable the slider dragging if any handle is disabled + function isHandleDisabled(handleNumber) { + var handleOrigin = scope_Handles[handleNumber]; + return handleOrigin.hasAttribute("disabled"); + } + function disable(handleNumber) { + if (handleNumber !== null && handleNumber !== undefined) { + scope_Handles[handleNumber].setAttribute("disabled", ""); + scope_Handles[handleNumber].handle.removeAttribute("tabindex"); + } + else { + scope_Target.setAttribute("disabled", ""); + scope_Handles.forEach(function (handle) { + handle.handle.removeAttribute("tabindex"); + }); + } + } + function enable(handleNumber) { + if (handleNumber !== null && handleNumber !== undefined) { + scope_Handles[handleNumber].removeAttribute("disabled"); + scope_Handles[handleNumber].handle.setAttribute("tabindex", "0"); + } + else { + scope_Target.removeAttribute("disabled"); + scope_Handles.forEach(function (handle) { + handle.removeAttribute("disabled"); + handle.handle.setAttribute("tabindex", "0"); + }); + } + } + function removeTooltips() { + if (scope_Tooltips) { + removeEvent("update" + INTERNAL_EVENT_NS.tooltips); + scope_Tooltips.forEach(function (tooltip) { + if (tooltip) { + removeElement(tooltip); + } + }); + scope_Tooltips = null; + } + } + // The tooltips option is a shorthand for using the 'update' event. + function tooltips() { + removeTooltips(); + // Tooltips are added with options.tooltips in original order. + scope_Tooltips = scope_Handles.map(addTooltip); + bindEvent("update" + INTERNAL_EVENT_NS.tooltips, function (values, handleNumber, unencoded) { + if (!scope_Tooltips || !options.tooltips) { + return; + } + if (scope_Tooltips[handleNumber] === false) { + return; + } + var formattedValue = values[handleNumber]; + if (options.tooltips[handleNumber] !== true) { + formattedValue = options.tooltips[handleNumber].to(unencoded[handleNumber]); + } + scope_Tooltips[handleNumber].innerHTML = formattedValue; + }); + } + function aria() { + removeEvent("update" + INTERNAL_EVENT_NS.aria); + bindEvent("update" + INTERNAL_EVENT_NS.aria, function (values, handleNumber, unencoded, tap, positions) { + // Update Aria Values for all handles, as a change in one changes min and max values for the next. + scope_HandleNumbers.forEach(function (index) { + var handle = scope_Handles[index]; + var min = checkHandlePosition(scope_Locations, index, 0, true, true, true); + var max = checkHandlePosition(scope_Locations, index, 100, true, true, true); + var now = positions[index]; + // Formatted value for display + var text = String(options.ariaFormat.to(unencoded[index])); + // Map to slider range values + min = scope_Spectrum.fromStepping(min).toFixed(1); + max = scope_Spectrum.fromStepping(max).toFixed(1); + now = scope_Spectrum.fromStepping(now).toFixed(1); + handle.children[0].setAttribute("aria-valuemin", min); + handle.children[0].setAttribute("aria-valuemax", max); + handle.children[0].setAttribute("aria-valuenow", now); + handle.children[0].setAttribute("aria-valuetext", text); + }); + }); + } + function getGroup(pips) { + // Use the range. + if (pips.mode === exports.PipsMode.Range || pips.mode === exports.PipsMode.Steps) { + return scope_Spectrum.xVal; + } + if (pips.mode === exports.PipsMode.Count) { + if (pips.values < 2) { + throw new Error("noUiSlider: 'values' (>= 2) required for mode 'count'."); + } + // Divide 0 - 100 in 'count' parts. + var interval = pips.values - 1; + var spread = 100 / interval; + var values = []; + // List these parts and have them handled as 'positions'. + while (interval--) { + values[interval] = interval * spread; + } + values.push(100); + return mapToRange(values, pips.stepped); + } + if (pips.mode === exports.PipsMode.Positions) { + // Map all percentages to on-range values. + return mapToRange(pips.values, pips.stepped); + } + if (pips.mode === exports.PipsMode.Values) { + // If the value must be stepped, it needs to be converted to a percentage first. + if (pips.stepped) { + return pips.values.map(function (value) { + // Convert to percentage, apply step, return to value. + return scope_Spectrum.fromStepping(scope_Spectrum.getStep(scope_Spectrum.toStepping(value))); + }); + } + // Otherwise, we can simply use the values. + return pips.values; + } + return []; // pips.mode = never + } + function mapToRange(values, stepped) { + return values.map(function (value) { + return scope_Spectrum.fromStepping(stepped ? scope_Spectrum.getStep(value) : value); + }); + } + function generateSpread(pips) { + function safeIncrement(value, increment) { + // Avoid floating point variance by dropping the smallest decimal places. + return Number((value + increment).toFixed(7)); + } + var group = getGroup(pips); + var indexes = {}; + var firstInRange = scope_Spectrum.xVal[0]; + var lastInRange = scope_Spectrum.xVal[scope_Spectrum.xVal.length - 1]; + var ignoreFirst = false; + var ignoreLast = false; + var prevPct = 0; + // Create a copy of the group, sort it and filter away all duplicates. + group = unique(group.slice().sort(function (a, b) { + return a - b; + })); + // Make sure the range starts with the first element. + if (group[0] !== firstInRange) { + group.unshift(firstInRange); + ignoreFirst = true; + } + // Likewise for the last one. + if (group[group.length - 1] !== lastInRange) { + group.push(lastInRange); + ignoreLast = true; + } + group.forEach(function (current, index) { + // Get the current step and the lower + upper positions. + var step; + var i; + var q; + var low = current; + var high = group[index + 1]; + var newPct; + var pctDifference; + var pctPos; + var type; + var steps; + var realSteps; + var stepSize; + var isSteps = pips.mode === exports.PipsMode.Steps; + // When using 'steps' mode, use the provided steps. + // Otherwise, we'll step on to the next subrange. + if (isSteps) { + step = scope_Spectrum.xNumSteps[index]; + } + // Default to a 'full' step. + if (!step) { + step = high - low; + } + // If high is undefined we are at the last subrange. Make sure it iterates once (#1088) + if (high === undefined) { + high = low; + } + // Make sure step isn't 0, which would cause an infinite loop (#654) + step = Math.max(step, 0.0000001); + // Find all steps in the subrange. + for (i = low; i <= high; i = safeIncrement(i, step)) { + // Get the percentage value for the current step, + // calculate the size for the subrange. + newPct = scope_Spectrum.toStepping(i); + pctDifference = newPct - prevPct; + steps = pctDifference / (pips.density || 1); + realSteps = Math.round(steps); + // This ratio represents the amount of percentage-space a point indicates. + // For a density 1 the points/percentage = 1. For density 2, that percentage needs to be re-divided. + // Round the percentage offset to an even number, then divide by two + // to spread the offset on both sides of the range. + stepSize = pctDifference / realSteps; + // Divide all points evenly, adding the correct number to this subrange. + // Run up to <= so that 100% gets a point, event if ignoreLast is set. + for (q = 1; q <= realSteps; q += 1) { + // The ratio between the rounded value and the actual size might be ~1% off. + // Correct the percentage offset by the number of points + // per subrange. density = 1 will result in 100 points on the + // full range, 2 for 50, 4 for 25, etc. + pctPos = prevPct + q * stepSize; + indexes[pctPos.toFixed(5)] = [scope_Spectrum.fromStepping(pctPos), 0]; + } + // Determine the point type. + type = group.indexOf(i) > -1 ? exports.PipsType.LargeValue : isSteps ? exports.PipsType.SmallValue : exports.PipsType.NoValue; + // Enforce the 'ignoreFirst' option by overwriting the type for 0. + if (!index && ignoreFirst && i !== high) { + type = 0; + } + if (!(i === high && ignoreLast)) { + // Mark the 'type' of this point. 0 = plain, 1 = real value, 2 = step value. + indexes[newPct.toFixed(5)] = [i, type]; + } + // Update the percentage count. + prevPct = newPct; + } + }); + return indexes; + } + function addMarking(spread, filterFunc, formatter) { + var _a, _b; + var element = scope_Document.createElement("div"); + var valueSizeClasses = (_a = {}, + _a[exports.PipsType.None] = "", + _a[exports.PipsType.NoValue] = options.cssClasses.valueNormal, + _a[exports.PipsType.LargeValue] = options.cssClasses.valueLarge, + _a[exports.PipsType.SmallValue] = options.cssClasses.valueSub, + _a); + var markerSizeClasses = (_b = {}, + _b[exports.PipsType.None] = "", + _b[exports.PipsType.NoValue] = options.cssClasses.markerNormal, + _b[exports.PipsType.LargeValue] = options.cssClasses.markerLarge, + _b[exports.PipsType.SmallValue] = options.cssClasses.markerSub, + _b); + var valueOrientationClasses = [options.cssClasses.valueHorizontal, options.cssClasses.valueVertical]; + var markerOrientationClasses = [options.cssClasses.markerHorizontal, options.cssClasses.markerVertical]; + addClass(element, options.cssClasses.pips); + addClass(element, options.ort === 0 ? options.cssClasses.pipsHorizontal : options.cssClasses.pipsVertical); + function getClasses(type, source) { + var a = source === options.cssClasses.value; + var orientationClasses = a ? valueOrientationClasses : markerOrientationClasses; + var sizeClasses = a ? valueSizeClasses : markerSizeClasses; + return source + " " + orientationClasses[options.ort] + " " + sizeClasses[type]; + } + function addSpread(offset, value, type) { + // Apply the filter function, if it is set. + type = filterFunc ? filterFunc(value, type) : type; + if (type === exports.PipsType.None) { + return; + } + // Add a marker for every point + var node = addNodeTo(element, false); + node.className = getClasses(type, options.cssClasses.marker); + node.style[options.style] = offset + "%"; + // Values are only appended for points marked '1' or '2'. + if (type > exports.PipsType.NoValue) { + node = addNodeTo(element, false); + node.className = getClasses(type, options.cssClasses.value); + node.setAttribute("data-value", String(value)); + node.style[options.style] = offset + "%"; + node.innerHTML = String(formatter.to(value)); + } + } + // Append all points. + Object.keys(spread).forEach(function (offset) { + addSpread(offset, spread[offset][0], spread[offset][1]); + }); + return element; + } + function removePips() { + if (scope_Pips) { + removeElement(scope_Pips); + scope_Pips = null; + } + } + function pips(pips) { + // Fix #669 + removePips(); + var spread = generateSpread(pips); + var filter = pips.filter; + var format = pips.format || { + to: function (value) { + return String(Math.round(value)); + }, + }; + scope_Pips = scope_Target.appendChild(addMarking(spread, filter, format)); + return scope_Pips; + } + // Shorthand for base dimensions. + function baseSize() { + var rect = scope_Base.getBoundingClientRect(); + var alt = ("offset" + ["Width", "Height"][options.ort]); + return options.ort === 0 ? rect.width || scope_Base[alt] : rect.height || scope_Base[alt]; + } + // Handler for attaching events trough a proxy. + function attachEvent(events, element, callback, data) { + // This function can be used to 'filter' events to the slider. + // element is a node, not a nodeList + var method = function (event) { + var e = fixEvent(event, data.pageOffset, data.target || element); + // fixEvent returns false if this event has a different target + // when handling (multi-) touch events; + if (!e) { + return false; + } + // doNotReject is passed by all end events to make sure released touches + // are not rejected, leaving the slider "stuck" to the cursor; + if (isSliderDisabled() && !data.doNotReject) { + return false; + } + // Stop if an active 'tap' transition is taking place. + if (hasClass(scope_Target, options.cssClasses.tap) && !data.doNotReject) { + return false; + } + // Ignore right or middle clicks on start #454 + if (events === actions.start && e.buttons !== undefined && e.buttons > 1) { + return false; + } + // Ignore right or middle clicks on start #454 + if (data.hover && e.buttons) { + return false; + } + // 'supportsPassive' is only true if a browser also supports touch-action: none in CSS. + // iOS safari does not, so it doesn't get to benefit from passive scrolling. iOS does support + // touch-action: manipulation, but that allows panning, which breaks + // sliders after zooming/on non-responsive pages. + // See: https://bugs.webkit.org/show_bug.cgi?id=133112 + if (!supportsPassive) { + e.preventDefault(); + } + e.calcPoint = e.points[options.ort]; + // Call the event handler with the event [ and additional data ]. + callback(e, data); + return; + }; + var methods = []; + // Bind a closure on the target for every event type. + events.split(" ").forEach(function (eventName) { + element.addEventListener(eventName, method, supportsPassive ? { passive: true } : false); + methods.push([eventName, method]); + }); + return methods; + } + // Provide a clean event with standardized offset values. + function fixEvent(e, pageOffset, eventTarget) { + // Filter the event to register the type, which can be + // touch, mouse or pointer. Offset changes need to be + // made on an event specific basis. + var touch = e.type.indexOf("touch") === 0; + var mouse = e.type.indexOf("mouse") === 0; + var pointer = e.type.indexOf("pointer") === 0; + var x = 0; + var y = 0; + // IE10 implemented pointer events with a prefix; + if (e.type.indexOf("MSPointer") === 0) { + pointer = true; + } + // Erroneous events seem to be passed in occasionally on iOS/iPadOS after user finishes interacting with + // the slider. They appear to be of type MouseEvent, yet they don't have usual properties set. Ignore + // events that have no touches or buttons associated with them. (#1057, #1079, #1095) + if (e.type === "mousedown" && !e.buttons && !e.touches) { + return false; + } + // The only thing one handle should be concerned about is the touches that originated on top of it. + if (touch) { + // Returns true if a touch originated on the target. + var isTouchOnTarget = function (checkTouch) { + var target = checkTouch.target; + return (target === eventTarget || + eventTarget.contains(target) || + (e.composed && e.composedPath().shift() === eventTarget)); + }; + // In the case of touchstart events, we need to make sure there is still no more than one + // touch on the target so we look amongst all touches. + if (e.type === "touchstart") { + var targetTouches = Array.prototype.filter.call(e.touches, isTouchOnTarget); + // Do not support more than one touch per handle. + if (targetTouches.length > 1) { + return false; + } + x = targetTouches[0].pageX; + y = targetTouches[0].pageY; + } + else { + // In the other cases, find on changedTouches is enough. + var targetTouch = Array.prototype.find.call(e.changedTouches, isTouchOnTarget); + // Cancel if the target touch has not moved. + if (!targetTouch) { + return false; + } + x = targetTouch.pageX; + y = targetTouch.pageY; + } + } + pageOffset = pageOffset || getPageOffset(scope_Document); + if (mouse || pointer) { + x = e.clientX + pageOffset.x; + y = e.clientY + pageOffset.y; + } + e.pageOffset = pageOffset; + e.points = [x, y]; + e.cursor = mouse || pointer; // Fix #435 + return e; + } + // Translate a coordinate in the document to a percentage on the slider + function calcPointToPercentage(calcPoint) { + var location = calcPoint - offset(scope_Base, options.ort); + var proposal = (location * 100) / baseSize(); + // Clamp proposal between 0% and 100% + // Out-of-bound coordinates may occur when .noUi-base pseudo-elements + // are used (e.g. contained handles feature) + proposal = limit(proposal); + return options.dir ? 100 - proposal : proposal; + } + // Find handle closest to a certain percentage on the slider + function getClosestHandle(clickedPosition) { + var smallestDifference = 100; + var handleNumber = false; + scope_Handles.forEach(function (handle, index) { + // Disabled handles are ignored + if (isHandleDisabled(index)) { + return; + } + var handlePosition = scope_Locations[index]; + var differenceWithThisHandle = Math.abs(handlePosition - clickedPosition); + // Initial state + var clickAtEdge = differenceWithThisHandle === 100 && smallestDifference === 100; + // Difference with this handle is smaller than the previously checked handle + var isCloser = differenceWithThisHandle < smallestDifference; + var isCloserAfter = differenceWithThisHandle <= smallestDifference && clickedPosition > handlePosition; + if (isCloser || isCloserAfter || clickAtEdge) { + handleNumber = index; + smallestDifference = differenceWithThisHandle; + } + }); + return handleNumber; + } + // Fire 'end' when a mouse or pen leaves the document. + function documentLeave(event, data) { + if (event.type === "mouseout" && + event.target.nodeName === "HTML" && + event.relatedTarget === null) { + eventEnd(event, data); + } + } + // Handle movement on document for handle and range drag. + function eventMove(event, data) { + // Fix #498 + // Check value of .buttons in 'start' to work around a bug in IE10 mobile (data.buttonsProperty). + // https://connect.microsoft.com/IE/feedback/details/927005/mobile-ie10-windows-phone-buttons-property-of-pointermove-event-always-zero + // IE9 has .buttons and .which zero on mousemove. + // Firefox breaks the spec MDN defines. + if (navigator.appVersion.indexOf("MSIE 9") === -1 && event.buttons === 0 && data.buttonsProperty !== 0) { + return eventEnd(event, data); + } + // Check if we are moving up or down + var movement = (options.dir ? -1 : 1) * (event.calcPoint - data.startCalcPoint); + // Convert the movement into a percentage of the slider width/height + var proposal = (movement * 100) / data.baseSize; + moveHandles(movement > 0, proposal, data.locations, data.handleNumbers, data.connect); + } + // Unbind move events on document, call callbacks. + function eventEnd(event, data) { + // The handle is no longer active, so remove the class. + if (data.handle) { + removeClass(data.handle, options.cssClasses.active); + scope_ActiveHandlesCount -= 1; + } + // Unbind the move and end events, which are added on 'start'. + data.listeners.forEach(function (c) { + scope_DocumentElement.removeEventListener(c[0], c[1]); + }); + if (scope_ActiveHandlesCount === 0) { + // Remove dragging class. + removeClass(scope_Target, options.cssClasses.drag); + setZindex(); + // Remove cursor styles and text-selection events bound to the body. + if (event.cursor) { + scope_Body.style.cursor = ""; + scope_Body.removeEventListener("selectstart", preventDefault); + } + } + if (options.events.smoothSteps) { + data.handleNumbers.forEach(function (handleNumber) { + setHandle(handleNumber, scope_Locations[handleNumber], true, true, false, false); + }); + data.handleNumbers.forEach(function (handleNumber) { + fireEvent("update", handleNumber); + }); + } + data.handleNumbers.forEach(function (handleNumber) { + fireEvent("change", handleNumber); + fireEvent("set", handleNumber); + fireEvent("end", handleNumber); + }); + } + // Bind move events on document. + function eventStart(event, data) { + // Ignore event if any handle is disabled + if (data.handleNumbers.some(isHandleDisabled)) { + return; + } + var handle; + if (data.handleNumbers.length === 1) { + var handleOrigin = scope_Handles[data.handleNumbers[0]]; + handle = handleOrigin.children[0]; + scope_ActiveHandlesCount += 1; + // Mark the handle as 'active' so it can be styled. + addClass(handle, options.cssClasses.active); + } + // A drag should never propagate up to the 'tap' event. + event.stopPropagation(); + // Record the event listeners. + var listeners = []; + // Attach the move and end events. + var moveEvent = attachEvent(actions.move, scope_DocumentElement, eventMove, { + // The event target has changed so we need to propagate the original one so that we keep + // relying on it to extract target touches. + target: event.target, + handle: handle, + connect: data.connect, + listeners: listeners, + startCalcPoint: event.calcPoint, + baseSize: baseSize(), + pageOffset: event.pageOffset, + handleNumbers: data.handleNumbers, + buttonsProperty: event.buttons, + locations: scope_Locations.slice(), + }); + var endEvent = attachEvent(actions.end, scope_DocumentElement, eventEnd, { + target: event.target, + handle: handle, + listeners: listeners, + doNotReject: true, + handleNumbers: data.handleNumbers, + }); + var outEvent = attachEvent("mouseout", scope_DocumentElement, documentLeave, { + target: event.target, + handle: handle, + listeners: listeners, + doNotReject: true, + handleNumbers: data.handleNumbers, + }); + // We want to make sure we pushed the listeners in the listener list rather than creating + // a new one as it has already been passed to the event handlers. + listeners.push.apply(listeners, moveEvent.concat(endEvent, outEvent)); + // Text selection isn't an issue on touch devices, + // so adding cursor styles can be skipped. + if (event.cursor) { + // Prevent the 'I' cursor and extend the range-drag cursor. + scope_Body.style.cursor = getComputedStyle(event.target).cursor; + // Mark the target with a dragging state. + if (scope_Handles.length > 1) { + addClass(scope_Target, options.cssClasses.drag); + } + // Prevent text selection when dragging the handles. + // In noUiSlider <= 9.2.0, this was handled by calling preventDefault on mouse/touch start/move, + // which is scroll blocking. The selectstart event is supported by FireFox starting from version 52, + // meaning the only holdout is iOS Safari. This doesn't matter: text selection isn't triggered there. + // The 'cursor' flag is false. + // See: http://caniuse.com/#search=selectstart + scope_Body.addEventListener("selectstart", preventDefault, false); + } + data.handleNumbers.forEach(function (handleNumber) { + fireEvent("start", handleNumber); + }); + } + // Move closest handle to tapped location. + function eventTap(event) { + // The tap event shouldn't propagate up + event.stopPropagation(); + var proposal = calcPointToPercentage(event.calcPoint); + var handleNumber = getClosestHandle(proposal); + // Tackle the case that all handles are 'disabled'. + if (handleNumber === false) { + return; + } + // Flag the slider as it is now in a transitional state. + // Transition takes a configurable amount of ms (default 300). Re-enable the slider after that. + if (!options.events.snap) { + addClassFor(scope_Target, options.cssClasses.tap, options.animationDuration); + } + setHandle(handleNumber, proposal, true, true); + setZindex(); + fireEvent("slide", handleNumber, true); + fireEvent("update", handleNumber, true); + if (!options.events.snap) { + fireEvent("change", handleNumber, true); + fireEvent("set", handleNumber, true); + } + else { + eventStart(event, { handleNumbers: [handleNumber] }); + } + } + // Fires a 'hover' event for a hovered mouse/pen position. + function eventHover(event) { + var proposal = calcPointToPercentage(event.calcPoint); + var to = scope_Spectrum.getStep(proposal); + var value = scope_Spectrum.fromStepping(to); + Object.keys(scope_Events).forEach(function (targetEvent) { + if ("hover" === targetEvent.split(".")[0]) { + scope_Events[targetEvent].forEach(function (callback) { + callback.call(scope_Self, value); + }); + } + }); + } + // Handles keydown on focused handles + // Don't move the document when pressing arrow keys on focused handles + function eventKeydown(event, handleNumber) { + if (isSliderDisabled() || isHandleDisabled(handleNumber)) { + return false; + } + var horizontalKeys = ["Left", "Right"]; + var verticalKeys = ["Down", "Up"]; + var largeStepKeys = ["PageDown", "PageUp"]; + var edgeKeys = ["Home", "End"]; + if (options.dir && !options.ort) { + // On an right-to-left slider, the left and right keys act inverted + horizontalKeys.reverse(); + } + else if (options.ort && !options.dir) { + // On a top-to-bottom slider, the up and down keys act inverted + verticalKeys.reverse(); + largeStepKeys.reverse(); + } + // Strip "Arrow" for IE compatibility. https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key + var key = event.key.replace("Arrow", ""); + var isLargeDown = key === largeStepKeys[0]; + var isLargeUp = key === largeStepKeys[1]; + var isDown = key === verticalKeys[0] || key === horizontalKeys[0] || isLargeDown; + var isUp = key === verticalKeys[1] || key === horizontalKeys[1] || isLargeUp; + var isMin = key === edgeKeys[0]; + var isMax = key === edgeKeys[1]; + if (!isDown && !isUp && !isMin && !isMax) { + return true; + } + event.preventDefault(); + var to; + if (isUp || isDown) { + var direction = isDown ? 0 : 1; + var steps = getNextStepsForHandle(handleNumber); + var step = steps[direction]; + // At the edge of a slider, do nothing + if (step === null) { + return false; + } + // No step set, use the default of 10% of the sub-range + if (step === false) { + step = scope_Spectrum.getDefaultStep(scope_Locations[handleNumber], isDown, options.keyboardDefaultStep); + } + if (isLargeUp || isLargeDown) { + step *= options.keyboardPageMultiplier; + } + else { + step *= options.keyboardMultiplier; + } + // Step over zero-length ranges (#948); + step = Math.max(step, 0.0000001); + // Decrement for down steps + step = (isDown ? -1 : 1) * step; + to = scope_Values[handleNumber] + step; + } + else if (isMax) { + // End key + to = options.spectrum.xVal[options.spectrum.xVal.length - 1]; + } + else { + // Home key + to = options.spectrum.xVal[0]; + } + setHandle(handleNumber, scope_Spectrum.toStepping(to), true, true); + fireEvent("slide", handleNumber); + fireEvent("update", handleNumber); + fireEvent("change", handleNumber); + fireEvent("set", handleNumber); + return false; + } + // Attach events to several slider parts. + function bindSliderEvents(behaviour) { + // Attach the standard drag event to the handles. + if (!behaviour.fixed) { + scope_Handles.forEach(function (handle, index) { + // These events are only bound to the visual handle + // element, not the 'real' origin element. + attachEvent(actions.start, handle.children[0], eventStart, { + handleNumbers: [index], + }); + }); + } + // Attach the tap event to the slider base. + if (behaviour.tap) { + attachEvent(actions.start, scope_Base, eventTap, {}); + } + // Fire hover events + if (behaviour.hover) { + attachEvent(actions.move, scope_Base, eventHover, { + hover: true, + }); + } + // Make the range draggable. + if (behaviour.drag) { + scope_Connects.forEach(function (connect, index) { + if (connect === false || index === 0 || index === scope_Connects.length - 1) { + return; + } + var handleBefore = scope_Handles[index - 1]; + var handleAfter = scope_Handles[index]; + var eventHolders = [connect]; + var handlesToDrag = [handleBefore, handleAfter]; + var handleNumbersToDrag = [index - 1, index]; + addClass(connect, options.cssClasses.draggable); + // When the range is fixed, the entire range can + // be dragged by the handles. The handle in the first + // origin will propagate the start event upward, + // but it needs to be bound manually on the other. + if (behaviour.fixed) { + eventHolders.push(handleBefore.children[0]); + eventHolders.push(handleAfter.children[0]); + } + if (behaviour.dragAll) { + handlesToDrag = scope_Handles; + handleNumbersToDrag = scope_HandleNumbers; + } + eventHolders.forEach(function (eventHolder) { + attachEvent(actions.start, eventHolder, eventStart, { + handles: handlesToDrag, + handleNumbers: handleNumbersToDrag, + connect: connect, + }); + }); + }); + } + } + // Attach an event to this slider, possibly including a namespace + function bindEvent(namespacedEvent, callback) { + scope_Events[namespacedEvent] = scope_Events[namespacedEvent] || []; + scope_Events[namespacedEvent].push(callback); + // If the event bound is 'update,' fire it immediately for all handles. + if (namespacedEvent.split(".")[0] === "update") { + scope_Handles.forEach(function (a, index) { + fireEvent("update", index); + }); + } + } + function isInternalNamespace(namespace) { + return namespace === INTERNAL_EVENT_NS.aria || namespace === INTERNAL_EVENT_NS.tooltips; + } + // Undo attachment of event + function removeEvent(namespacedEvent) { + var event = namespacedEvent && namespacedEvent.split(".")[0]; + var namespace = event ? namespacedEvent.substring(event.length) : namespacedEvent; + Object.keys(scope_Events).forEach(function (bind) { + var tEvent = bind.split(".")[0]; + var tNamespace = bind.substring(tEvent.length); + if ((!event || event === tEvent) && (!namespace || namespace === tNamespace)) { + // only delete protected internal event if intentional + if (!isInternalNamespace(tNamespace) || namespace === tNamespace) { + delete scope_Events[bind]; + } + } + }); + } + // External event handling + function fireEvent(eventName, handleNumber, tap) { + Object.keys(scope_Events).forEach(function (targetEvent) { + var eventType = targetEvent.split(".")[0]; + if (eventName === eventType) { + scope_Events[targetEvent].forEach(function (callback) { + callback.call( + // Use the slider public API as the scope ('this') + scope_Self, + // Return values as array, so arg_1[arg_2] is always valid. + scope_Values.map(options.format.to), + // Handle index, 0 or 1 + handleNumber, + // Un-formatted slider values + scope_Values.slice(), + // Event is fired by tap, true or false + tap || false, + // Left offset of the handle, in relation to the slider + scope_Locations.slice(), + // add the slider public API to an accessible parameter when this is unavailable + scope_Self); + }); + } + }); + } + // Split out the handle positioning logic so the Move event can use it, too + function checkHandlePosition(reference, handleNumber, to, lookBackward, lookForward, getValue, smoothSteps) { + var distance; + // For sliders with multiple handles, limit movement to the other handle. + // Apply the margin option by adding it to the handle positions. + if (scope_Handles.length > 1 && !options.events.unconstrained) { + if (lookBackward && handleNumber > 0) { + distance = scope_Spectrum.getAbsoluteDistance(reference[handleNumber - 1], options.margin, false); + to = Math.max(to, distance); + } + if (lookForward && handleNumber < scope_Handles.length - 1) { + distance = scope_Spectrum.getAbsoluteDistance(reference[handleNumber + 1], options.margin, true); + to = Math.min(to, distance); + } + } + // The limit option has the opposite effect, limiting handles to a + // maximum distance from another. Limit must be > 0, as otherwise + // handles would be unmovable. + if (scope_Handles.length > 1 && options.limit) { + if (lookBackward && handleNumber > 0) { + distance = scope_Spectrum.getAbsoluteDistance(reference[handleNumber - 1], options.limit, false); + to = Math.min(to, distance); + } + if (lookForward && handleNumber < scope_Handles.length - 1) { + distance = scope_Spectrum.getAbsoluteDistance(reference[handleNumber + 1], options.limit, true); + to = Math.max(to, distance); + } + } + // The padding option keeps the handles a certain distance from the + // edges of the slider. Padding must be > 0. + if (options.padding) { + if (handleNumber === 0) { + distance = scope_Spectrum.getAbsoluteDistance(0, options.padding[0], false); + to = Math.max(to, distance); + } + if (handleNumber === scope_Handles.length - 1) { + distance = scope_Spectrum.getAbsoluteDistance(100, options.padding[1], true); + to = Math.min(to, distance); + } + } + if (!smoothSteps) { + to = scope_Spectrum.getStep(to); + } + // Limit percentage to the 0 - 100 range + to = limit(to); + // Return false if handle can't move + if (to === reference[handleNumber] && !getValue) { + return false; + } + return to; + } + // Uses slider orientation to create CSS rules. a = base value; + function inRuleOrder(v, a) { + var o = options.ort; + return (o ? a : v) + ", " + (o ? v : a); + } + // Moves handle(s) by a percentage + // (bool, % to move, [% where handle started, ...], [index in scope_Handles, ...]) + function moveHandles(upward, proposal, locations, handleNumbers, connect) { + var proposals = locations.slice(); + // Store first handle now, so we still have it in case handleNumbers is reversed + var firstHandle = handleNumbers[0]; + var smoothSteps = options.events.smoothSteps; + var b = [!upward, upward]; + var f = [upward, !upward]; + // Copy handleNumbers so we don't change the dataset + handleNumbers = handleNumbers.slice(); + // Check to see which handle is 'leading'. + // If that one can't move the second can't either. + if (upward) { + handleNumbers.reverse(); + } + // Step 1: get the maximum percentage that any of the handles can move + if (handleNumbers.length > 1) { + handleNumbers.forEach(function (handleNumber, o) { + var to = checkHandlePosition(proposals, handleNumber, proposals[handleNumber] + proposal, b[o], f[o], false, smoothSteps); + // Stop if one of the handles can't move. + if (to === false) { + proposal = 0; + } + else { + proposal = to - proposals[handleNumber]; + proposals[handleNumber] = to; + } + }); + } + // If using one handle, check backward AND forward + else { + b = f = [true]; + } + var state = false; + // Step 2: Try to set the handles with the found percentage + handleNumbers.forEach(function (handleNumber, o) { + state = + setHandle(handleNumber, locations[handleNumber] + proposal, b[o], f[o], false, smoothSteps) || state; + }); + // Step 3: If a handle moved, fire events + if (state) { + handleNumbers.forEach(function (handleNumber) { + fireEvent("update", handleNumber); + fireEvent("slide", handleNumber); + }); + // If target is a connect, then fire drag event + if (connect != undefined) { + fireEvent("drag", firstHandle); + } + } + } + // Takes a base value and an offset. This offset is used for the connect bar size. + // In the initial design for this feature, the origin element was 1% wide. + // Unfortunately, a rounding bug in Chrome makes it impossible to implement this feature + // in this manner: https://bugs.chromium.org/p/chromium/issues/detail?id=798223 + function transformDirection(a, b) { + return options.dir ? 100 - a - b : a; + } + // Updates scope_Locations and scope_Values, updates visual state + function updateHandlePosition(handleNumber, to) { + // Update locations. + scope_Locations[handleNumber] = to; + // Convert the value to the slider stepping/range. + scope_Values[handleNumber] = scope_Spectrum.fromStepping(to); + var translation = transformDirection(to, 0) - scope_DirOffset; + var translateRule = "translate(" + inRuleOrder(translation + "%", "0") + ")"; + scope_Handles[handleNumber].style[options.transformRule] = translateRule; + // sanity check for at least 2 handles (e.g. during setup) + if (options.events.invertConnects && scope_Locations.length > 1) { + // check if handles passed each other, but don't match the ConnectsInverted state + var handlesAreInOrder = scope_Locations.every(function (position, index, locations) { + return index === 0 || position >= locations[index - 1]; + }); + if (scope_ConnectsInverted !== !handlesAreInOrder) { + // invert connects when handles pass each other + invertConnects(); + // invertConnects already updates all connect elements + return; + } + } + updateConnect(handleNumber); + updateConnect(handleNumber + 1); + if (scope_ConnectsInverted) { + // When connects are inverted, we also have to update adjacent connects + updateConnect(handleNumber - 1); + updateConnect(handleNumber + 2); + } + } + // Handles before the slider middle are stacked later = higher, + // Handles after the middle later is lower + // [[7] [8] .......... | .......... [5] [4] + function setZindex() { + scope_HandleNumbers.forEach(function (handleNumber) { + var dir = scope_Locations[handleNumber] > 50 ? -1 : 1; + var zIndex = 3 + (scope_Handles.length + dir * handleNumber); + scope_Handles[handleNumber].style.zIndex = String(zIndex); + }); + } + // Test suggested values and apply margin, step. + // if exactInput is true, don't run checkHandlePosition, then the handle can be placed in between steps (#436) + function setHandle(handleNumber, to, lookBackward, lookForward, exactInput, smoothSteps) { + if (!exactInput) { + to = checkHandlePosition(scope_Locations, handleNumber, to, lookBackward, lookForward, false, smoothSteps); + } + if (to === false) { + return false; + } + updateHandlePosition(handleNumber, to); + return true; + } + // Updates style attribute for connect nodes + function updateConnect(index) { + // Skip connects set to false + if (!scope_Connects[index]) { + return; + } + // Create a copy of locations, so we can sort them for the local scope logic + var locations = scope_Locations.slice(); + if (scope_ConnectsInverted) { + locations.sort(function (a, b) { + return a - b; + }); + } + var l = 0; + var h = 100; + if (index !== 0) { + l = locations[index - 1]; + } + if (index !== scope_Connects.length - 1) { + h = locations[index]; + } + // We use two rules: + // 'translate' to change the left/top offset; + // 'scale' to change the width of the element; + // As the element has a width of 100%, a translation of 100% is equal to 100% of the parent (.noUi-base) + var connectWidth = h - l; + var translateRule = "translate(" + inRuleOrder(transformDirection(l, connectWidth) + "%", "0") + ")"; + var scaleRule = "scale(" + inRuleOrder(connectWidth / 100, "1") + ")"; + scope_Connects[index].style[options.transformRule] = + translateRule + " " + scaleRule; + } + // Parses value passed to .set method. Returns current value if not parse-able. + function resolveToValue(to, handleNumber) { + // Setting with null indicates an 'ignore'. + // Inputting 'false' is invalid. + if (to === null || to === false || to === undefined) { + return scope_Locations[handleNumber]; + } + // If a formatted number was passed, attempt to decode it. + if (typeof to === "number") { + to = String(to); + } + to = options.format.from(to); + if (to !== false) { + to = scope_Spectrum.toStepping(to); + } + // If parsing the number failed, use the current value. + if (to === false || isNaN(to)) { + return scope_Locations[handleNumber]; + } + return to; + } + // Set the slider value. + function valueSet(input, fireSetEvent, exactInput) { + var values = asArray(input); + var isInit = scope_Locations[0] === undefined; + // Event fires by default + fireSetEvent = fireSetEvent === undefined ? true : fireSetEvent; + // Animation is optional. + // Make sure the initial values were set before using animated placement. + if (options.animate && !isInit) { + addClassFor(scope_Target, options.cssClasses.tap, options.animationDuration); + } + // First pass, without lookAhead but with lookBackward. Values are set from left to right. + scope_HandleNumbers.forEach(function (handleNumber) { + setHandle(handleNumber, resolveToValue(values[handleNumber], handleNumber), true, false, exactInput); + }); + var i = scope_HandleNumbers.length === 1 ? 0 : 1; + // Spread handles evenly across the slider if the range has no size (min=max) + if (isInit && scope_Spectrum.hasNoSize()) { + exactInput = true; + scope_Locations[0] = 0; + if (scope_HandleNumbers.length > 1) { + var space_1 = 100 / (scope_HandleNumbers.length - 1); + scope_HandleNumbers.forEach(function (handleNumber) { + scope_Locations[handleNumber] = handleNumber * space_1; + }); + } + } + // Secondary passes. Now that all base values are set, apply constraints. + // Iterate all handles to ensure constraints are applied for the entire slider (Issue #1009) + for (; i < scope_HandleNumbers.length; ++i) { + scope_HandleNumbers.forEach(function (handleNumber) { + setHandle(handleNumber, scope_Locations[handleNumber], true, true, exactInput); + }); + } + setZindex(); + scope_HandleNumbers.forEach(function (handleNumber) { + fireEvent("update", handleNumber); + // Fire the event only for handles that received a new value, as per #579 + if (values[handleNumber] !== null && fireSetEvent) { + fireEvent("set", handleNumber); + } + }); + } + // Reset slider to initial values + function valueReset(fireSetEvent) { + valueSet(options.start, fireSetEvent); + } + // Set value for a single handle + function valueSetHandle(handleNumber, value, fireSetEvent, exactInput) { + // Ensure numeric input + handleNumber = Number(handleNumber); + if (!(handleNumber >= 0 && handleNumber < scope_HandleNumbers.length)) { + throw new Error("noUiSlider: invalid handle number, got: " + handleNumber); + } + // Look both backward and forward, since we don't want this handle to "push" other handles (#960); + // The exactInput argument can be used to ignore slider stepping (#436) + setHandle(handleNumber, resolveToValue(value, handleNumber), true, true, exactInput); + fireEvent("update", handleNumber); + if (fireSetEvent) { + fireEvent("set", handleNumber); + } + } + // Get the slider value. + function valueGet(unencoded) { + if (unencoded === void 0) { unencoded = false; } + if (unencoded) { + // return a copy of the raw values + return scope_Values.length === 1 ? scope_Values[0] : scope_Values.slice(0); + } + var values = scope_Values.map(options.format.to); + // If only one handle is used, return a single value. + if (values.length === 1) { + return values[0]; + } + return values; + } + // Removes classes from the root and empties it. + function destroy() { + // remove protected internal listeners + removeEvent(INTERNAL_EVENT_NS.aria); + removeEvent(INTERNAL_EVENT_NS.tooltips); + Object.keys(options.cssClasses).forEach(function (key) { + removeClass(scope_Target, options.cssClasses[key]); + }); + while (scope_Target.firstChild) { + scope_Target.removeChild(scope_Target.firstChild); + } + delete scope_Target.noUiSlider; + } + function getNextStepsForHandle(handleNumber) { + var location = scope_Locations[handleNumber]; + var nearbySteps = scope_Spectrum.getNearbySteps(location); + var value = scope_Values[handleNumber]; + var increment = nearbySteps.thisStep.step; + var decrement = null; + // If snapped, directly use defined step value + if (options.snap) { + return [ + value - nearbySteps.stepBefore.startValue || null, + nearbySteps.stepAfter.startValue - value || null, + ]; + } + // If the next value in this step moves into the next step, + // the increment is the start of the next step - the current value + if (increment !== false) { + if (value + increment > nearbySteps.stepAfter.startValue) { + increment = nearbySteps.stepAfter.startValue - value; + } + } + // If the value is beyond the starting point + if (value > nearbySteps.thisStep.startValue) { + decrement = nearbySteps.thisStep.step; + } + else if (nearbySteps.stepBefore.step === false) { + decrement = false; + } + // If a handle is at the start of a step, it always steps back into the previous step first + else { + decrement = value - nearbySteps.stepBefore.highestStep; + } + // Now, if at the slider edges, there is no in/decrement + if (location === 100) { + increment = null; + } + else if (location === 0) { + decrement = null; + } + // As per #391, the comparison for the decrement step can have some rounding issues. + var stepDecimals = scope_Spectrum.countStepDecimals(); + // Round per #391 + if (increment !== null && increment !== false) { + increment = Number(increment.toFixed(stepDecimals)); + } + if (decrement !== null && decrement !== false) { + decrement = Number(decrement.toFixed(stepDecimals)); + } + return [decrement, increment]; + } + // Get the current step size for the slider. + function getNextSteps() { + return scope_HandleNumbers.map(getNextStepsForHandle); + } + // Updatable: margin, limit, padding, step, range, animate, snap + function updateOptions(optionsToUpdate, fireSetEvent) { + // Spectrum is created using the range, snap, direction and step options. + // 'snap' and 'step' can be updated. + // If 'snap' and 'step' are not passed, they should remain unchanged. + var v = valueGet(); + var updateAble = [ + "margin", + "limit", + "padding", + "range", + "animate", + "snap", + "step", + "format", + "pips", + "tooltips", + "connect", + ]; + // Only change options that we're actually passed to update. + updateAble.forEach(function (name) { + // Check for undefined. null removes the value. + if (optionsToUpdate[name] !== undefined) { + originalOptions[name] = optionsToUpdate[name]; + } + }); + var newOptions = testOptions(originalOptions); + // Load new options into the slider state + updateAble.forEach(function (name) { + if (optionsToUpdate[name] !== undefined) { + options[name] = newOptions[name]; + } + }); + scope_Spectrum = newOptions.spectrum; + // Limit, margin and padding depend on the spectrum but are stored outside of it. (#677) + options.margin = newOptions.margin; + options.limit = newOptions.limit; + options.padding = newOptions.padding; + // Update pips, removes existing. + if (options.pips) { + pips(options.pips); + } + else { + removePips(); + } + // Update tooltips, removes existing. + if (options.tooltips) { + tooltips(); + } + else { + removeTooltips(); + } + // Invalidate the current positioning so valueSet forces an update. + scope_Locations = []; + valueSet(isSet(optionsToUpdate.start) ? optionsToUpdate.start : v, fireSetEvent); + // Update connects only if it was set + if (optionsToUpdate.connect) { + updateConnectOption(); + } + } + function updateConnectOption() { + // IE supported way of removing children including event handlers + while (scope_ConnectBase.firstChild) { + scope_ConnectBase.removeChild(scope_ConnectBase.firstChild); + } + // Adding new connects according to the new connect options + for (var i = 0; i <= options.handles; i++) { + scope_Connects[i] = addConnect(scope_ConnectBase, options.connect[i]); + updateConnect(i); + } + // re-adding drag events for the new connect elements + // to ignore the other events we have to negate the 'if (!behaviour.fixed)' check + bindSliderEvents({ drag: options.events.drag, fixed: true }); + } + // Invert options for connect handles + function invertConnects() { + scope_ConnectsInverted = !scope_ConnectsInverted; + testConnect(options, + // inverse the connect boolean array + options.connect.map(function (b) { return !b; })); + updateConnectOption(); + } + // Initialization steps + function setupSlider() { + // Create the base element, initialize HTML and set classes. + // Add handles and connect elements. + scope_Base = addSlider(scope_Target); + addElements(options.connect, scope_Base); + // Attach user events. + bindSliderEvents(options.events); + // Use the public value method to set the start values. + valueSet(options.start); + if (options.pips) { + pips(options.pips); + } + if (options.tooltips) { + tooltips(); + } + aria(); + } + setupSlider(); + var scope_Self = { + destroy: destroy, + steps: getNextSteps, + on: bindEvent, + off: removeEvent, + get: valueGet, + set: valueSet, + setHandle: valueSetHandle, + reset: valueReset, + disable: disable, + enable: enable, + // Exposed for unit testing, don't use this in your application. + __moveHandles: function (upward, proposal, handleNumbers) { + moveHandles(upward, proposal, scope_Locations, handleNumbers); + }, + options: originalOptions, + updateOptions: updateOptions, + target: scope_Target, + removePips: removePips, + removeTooltips: removeTooltips, + getPositions: function () { + return scope_Locations.slice(); + }, + getTooltips: function () { + return scope_Tooltips; + }, + getOrigins: function () { + return scope_Handles; + }, + pips: pips, // Issue #594 + }; + return scope_Self; + } + // Run the standard initializer + function initialize(target, originalOptions) { + if (!target || !target.nodeName) { + throw new Error("noUiSlider: create requires a single element, got: " + target); + } + // Throw an error if the slider was already initialized. + if (target.noUiSlider) { + throw new Error("noUiSlider: Slider was already initialized."); + } + // Test the options and create the slider environment; + var options = testOptions(originalOptions); + var api = scope(target, options, originalOptions); + target.noUiSlider = api; + return api; + } + var nouislider = { + // Exposed for unit testing, don't use this in your application. + __spectrum: Spectrum, + // A reference to the default classes, allows global changes. + // Use the cssClasses option for changes to one slider. + cssClasses: cssClasses, + create: initialize, + }; + + exports.create = initialize; + exports.cssClasses = cssClasses; + exports["default"] = nouislider; + + Object.defineProperty(exports, '__esModule', { value: true }); + +})); diff --git a/html/script.js b/html/script.js index 9ab685f..3f51ead 100644 --- a/html/script.js +++ b/html/script.js @@ -1,10 +1,134 @@ let tg = window.Telegram.WebApp; -let btn = document.getElementById("openData"); -let output = document.getElementById("output"); tg.expand(); // Expand the app to full screen tg.ready(); // Notify Telegram that the app is ready -btn.addEventListener('click', function(){ - output.innerText = `User ID: ${tg.initDataUnsafe.user.id}`; -}); \ No newline at end of file +function send_data() { + let filters = { + is_qual: document.getElementById('is_qual').checked, + is_amort: document.getElementById('is_amort').checked, + duration: { + // from: parseInt(document.querySelector(".duration .input .field .from").value), + // to: parseInt(document.querySelector(".duration .input .field .to").value), + + // from: parseInt(document.getElementById('duration.from').value), + // to: parseInt(document.getElementById('duration.to').value), + }, + + // toString() { + // return `{"is_qual": ${this.is_qual}, "is_amort": ${this.is_amort}}`; + // } + }; + + document.getElementById('filters').value = JSON.stringify(filters); + + fetch("https://jbond-app.ru:8080/filters", { + method: "POST", + body: JSON.stringify(filters), + headers: { + "Content-type": "application/json; charset=UTF-8" + } + }); + //.then((response) => response.json()); + //.then((json) => console.log(json)); +} + +// tg.MainButton.setText('Готово'); +// tg.MainButton.show(); +// tg.MainButton.onClick(() => { +// send_data(); +// // tg.sendData(json); +// tg.close(); +// }); + + +let btn_ok = document.getElementById("btn_ok"); +btn_ok.addEventListener('click', () => { + send_data(); + //tg.close(); +}); + + + +//Слайдер дюрации +var durationSlider = document.getElementById('duration-slider'); +noUiSlider.create(durationSlider, { + start: [3, 36], + connect: true, + range: { + 'min': 0, + 'max': 100 + } +}); + +var duration_from = document.getElementById('duration-from'); +var duration_to = document.getElementById('duration-to'); +var durations = [duration_from, duration_to]; + +durationSlider.noUiSlider.on('update', function (values, handle) { + durations[handle].value = Math.round(values[handle]); +}); + +duration_from.addEventListener('change', function () { + durationSlider.noUiSlider.set([null, this.value]); +}); +duration_to.addEventListener('change', function () { + durationSlider.noUiSlider.set([null, this.value]); +}); + + + +// Слайдер полной доходности +var fullProfitSlider = document.getElementById('full-profit-slider'); +noUiSlider.create(fullProfitSlider, { + start: [20.0, 50.0], + connect: true, + range: { + 'min': 0.0, + 'max': 50.0 + } +}); + +var full_profit_from = document.getElementById('full-profit-from'); +var full_profit_to = document.getElementById('full-profit-to'); +var full_profits = [full_profit_from, full_profit_to]; + +fullProfitSlider.noUiSlider.on('update', function (values, handle) { + full_profits[handle].value = Math.round(values[handle]*2)/2; +}); + +full_profit_from.addEventListener('change', function () { + fullProfitSlider.noUiSlider.set([null, this.value]); +}); +full_profit_to.addEventListener('change', function () { + fullProfitSlider.noUiSlider.set([null, this.value]); +}); + + + +//Слайдер див доходности +var divProfitSlider = document.getElementById('div-profit-slider'); +noUiSlider.create(divProfitSlider, { + start: [20.0, 50.0], + connect: true, + range: { + 'min': 0.0, + 'max': 50.0 + } +}); + +var div_profit_from = document.getElementById('div-profit-from'); +var div_profit_to = document.getElementById('div-profit-to'); +var div_profits = [div_profit_from, div_profit_to]; + +divProfitSlider.noUiSlider.on('update', function (values, handle) { + div_profits[handle].value = Math.round(values[handle]*2)/2; +}); + +div_profit_from.addEventListener('change', function () { + divProfitSlider.noUiSlider.set([null, this.value]); +}); + +div_profit_to.addEventListener('change', function () { + divProfitSlider.noUiSlider.set([null, this.value]); +}); diff --git a/html/style.css b/html/style.css new file mode 100644 index 0000000..292bc90 --- /dev/null +++ b/html/style.css @@ -0,0 +1,109 @@ +body { + background-color: #c8c8c8; +} + +button { + padding: 17px 40px; + border-radius: 50px; + cursor: pointer; + border: 0; + bottom: 20px; + background-color: hsl(261deg 80% 48%); + box-shadow: rgb(0 0 0 / 5%) 0 0 8px; + letter-spacing: 1.5px; + text-transform: uppercase; + font-size: 15px; + color: hsl(0, 0%, 100%); + transition: all 0.5s ease; + width: 200px; +} + +button:hover { + letter-spacing: 3px; + background-color: hsl(261deg 80% 48%); + color: hsl(0, 0%, 100%); + box-shadow: rgb(93 24 220) 0px 7px 29px 0px; +} + +button:active { + letter-spacing: 3px; + background-color: hsl(261deg 80% 48%); + color: hsl(0, 0%, 100%); + box-shadow: rgb(93 24 220) 0px 0px 0px 0px; + transform: translateY(10px); + transition: 100ms; +} + + + +/* Блок фильтра */ +.wrapper { + border-radius: 10px; + padding: 20px 25px 20px; + box-shadow: 0 12px 35px rgba(0, 0, 0, 0.1); + margin-top: 5px; + background-color: #f5f5f5; +} + +.block-name { + font-family: Tahoma, "Open Sans", Verdana, sans-serif; + margin-right: 16px; + font-size: 18px; + line-height: 40px; +} + +.fields { + text-align: center; +} + +.field { + display: inline-block; +} + +.separator { + display: inline-block; + margin: 10px; +} + +.field-left { + position: absolute; + left: 32px; +} + +.field-right { + position: absolute; + right: 32px; +} + +input[type='number']{ + width: 80px; + padding: 7px; + text-align: center; + border: 1px solid #c8c8c8; + border-radius: 5px; + font-size: 18px; + line-height: 18px; + color: #585858; +} + +input[type='checkbox']{ + transform: scale(2); + margin: 10px 10px; +} + +.slider { + height: 10px; + margin: 10px 0px 0px; +} + +.slider .noUi-connect { + background: #c0392b; +} + +.slider .noUi-handle { + height: 24px; + width: 24px; + top: -5px; + right: -12px; + border-radius: 12px; +} \ No newline at end of file diff --git a/src/handlers/start.py b/src/handlers/start.py index dc67312..08fbf68 100644 --- a/src/handlers/start.py +++ b/src/handlers/start.py @@ -10,24 +10,21 @@ logger = logging.getLogger("Start") @start_router.message(CommandStart()) -async def cmd_start(message: Message): - logger.info(f'CommandStart {message.from_user.full_name}') - +async def handle_start(message: Message): + logger.info(f'Command /start from {message.from_user.full_name}') address = config["server"]["address"] port = config["server"]["port"] - webAppInfo = WebAppInfo(url = f"https://{address}:{port}/index.html") + webAppInfo = WebAppInfo(url = f"https://{address}:{port}") builder = ReplyKeyboardBuilder() builder.add(KeyboardButton(text = 'Открыть фильтры', web_app = webAppInfo)) - await message.answer(text = 'Хуильтры', reply_markup = builder.as_markup()) - -# @start_router.message(Command('filters')) -# async def cmd_filters(message: Message): -# webAppInfo = WebAppInfo(url = f"https://{ADDR}:{PORT}/index.html") -# builder = ReplyKeyboardBuilder() -# builder.add(KeyboardButton(text = 'Открыть фильтры', web_app = webAppInfo)) -# await message.answer(reply_markup = builder.as_markup()) + await message.answer(text = 'Поехали', reply_markup = builder.as_markup()) -# @start_router.message(F.text == '/start_3') -# async def cmd_start_3(message: Message): -# logger.info(f'start_3 {message.from_user.full_name}') -# await message.answer('Запуск сообщения по команде /start_3 используя магический фильтр F.text!') \ No newline at end of file +@start_router.message(Command('filters')) +async def cmd_filters(message: Message): + logger.info(f'Command /filters from {message.from_user.full_name}') + address = config["server"]["address"] + port = config["server"]["port"] + webAppInfo = WebAppInfo(url = f"https://{address}:{port}") + builder = ReplyKeyboardBuilder() + builder.add(KeyboardButton(text = 'Открыть фильтры', web_app = webAppInfo)) + await message.answer(text = 'Хуильтры', reply_markup = builder.as_markup()) \ No newline at end of file diff --git a/src/handlers/web_app.py b/src/handlers/web_app.py new file mode 100644 index 0000000..9170c2c --- /dev/null +++ b/src/handlers/web_app.py @@ -0,0 +1,13 @@ +from aiogram import Router +from aiogram.types import Message +from logger import * + +app_router = Router() + +logger = logging.getLogger("App") + +@app_router.message(lambda message: message.web_app_data) +async def handle_web_app_data(message: Message): + logger.info(f'{message.web_app_data}') + + await message.answer('Получи') diff --git a/src/http_server.py b/src/http_server.py index f8c96c5..014203e 100644 --- a/src/http_server.py +++ b/src/http_server.py @@ -1,17 +1,28 @@ -from http.server import HTTPServer, BaseHTTPRequestHandler +from http.server import HTTPServer, BaseHTTPRequestHandler, SimpleHTTPRequestHandler from logger import * from threading import Thread import ssl import mimetypes +from config import config logger = logging.getLogger("Http") -class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): +class HTTPRequestHandler(SimpleHTTPRequestHandler): def do_POST(self): logger.info(f'Incoming POST {self.path} from {self.client_address}') - self.send_response(200) + if self.path == '/filters': + file_length = int(self.headers['Content-Length']) + filters = self.rfile.read(file_length) + logger.info(f'Received filters: {filters}') + + self.send_response(200) + else: + self.send_response(400) + + self.send_header('Host': f'{address}:{port}') self.send_header('Content-Length', 0) + self.send_header('Connection', 'close') self.end_headers() def do_GET(self): @@ -27,27 +38,43 @@ def do_GET(self): with open(path, 'rb') as file: content = file.read() self.send_response(200) + self.send_header('Host': f'{address}:{port}') self.send_header('Content-Type', f'{mime_type}') self.send_header('Content-Length', len(content)) + self.send_header('Connection', 'close') self.end_headers() self.wfile.write(content) except: self.send_response(404) + self.send_header('Host': f'{address}:{port}') self.send_header('Content-Length', 0) + self.send_header('Connection', 'close') self.end_headers() class HttpServer(Thread): + __port__ = None __httpd__ = None def __init__(self, port): super().__init__(name = 'HttpServer') - self.__httpd__ = HTTPServer(('0.0.0.0', port), SimpleHTTPRequestHandler) + self.__port__ = port + + HTTPServer.allow_reuse_address = True + self.__httpd__ = HTTPServer(('0.0.0.0', self.__port__), HTTPRequestHandler) + + self.__httpd__.timeout = 1 self.__httpd__.socket = ssl.wrap_socket(self.__httpd__.socket, keyfile = '/etc/letsencrypt/live/jbond-app.ru/privkey.pem', certfile = '/etc/letsencrypt/live/jbond-app.ru/cert.pem', server_side = True) - logger.info(f'Starting httpd server on port {port}...') + logger.info(f'Starting httpd server on port {self.__port__}...') def run(self): - self.__httpd__.serve_forever() \ No newline at end of file + try: + self.__httpd__.serve_forever() + except Exception as e: + logger.info(f'HttpServer error: {e}') + finally: + logger.info(f'Stopping httpd server on port {self.__port__}...') + self.__httpd__.server_close() diff --git a/src/main.py b/src/main.py index 91d49d7..7f5c3cc 100644 --- a/src/main.py +++ b/src/main.py @@ -4,6 +4,7 @@ from config import config from http_server import HttpServer from handlers.start import start_router +from handlers.web_app import app_router from aiogram import Bot, Dispatcher from aiogram.fsm.storage.memory import MemoryStorage @@ -19,6 +20,7 @@ async def main(): dispatcher = Dispatcher(storage = MemoryStorage()) dispatcher.include_router(start_router) + dispatcher.include_router(app_router) await bot.delete_webhook(drop_pending_updates = True, request_timeout = 10) await dispatcher.start_polling(bot) From dada4e1295963c5fc2916abd69d3b7b963364300 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 11:16:23 +0300 Subject: [PATCH 02/48] create db --- .github/workflows/ci.yml | 24 ++++++++-- db/init.sh | 6 +++ html/index.html | 24 +++++++--- html/nouislider/nouislider.js | 14 +++--- html/script.js | 89 ++++++++++++++++++++++++++++------- html/style.css | 18 ++++++- src/http_server.py | 4 -- 7 files changed, 139 insertions(+), 40 deletions(-) create mode 100644 db/init.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4036d17..2e4ed39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,10 @@ jobs: PORT: 8080 CRON_CERT_RENEW_JOB: '30 4 * * * /usr/bin/certbot renew --quiet' CRON_CERT_RENEW_FILE: certbot.renew.cron + PG_HBA: /var/lib/pgsql/data/pg_hba.conf + DB_NAME: jbond_db + DB_USER: jbond + DB_PASS: jbond steps: - name: Checkout code uses: actions/checkout@v3 @@ -33,11 +37,23 @@ jobs: python3 -m ensurepip python3 -m venv /opt/certbot/ pip3 install aiogram tomli certbot - - - name: Install some html stuff + - name: Install postgresql run: | - yes | yum install npm - npm install nouislider + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "yes | yum install postgresql-server" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "postgresql-setup --initdb --unit postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/' > $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/' > $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl start postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'sh $DIRECTORY/db/init.sh $DB_NAME $DB_USER $DB_PASS'" + + + # - name: Install some html stuff + # run: | + # yes | yum install npm + # npm install toml - name: install ssh keys # check this thread to understand why its needed: diff --git a/db/init.sh b/db/init.sh new file mode 100644 index 0000000..e820791 --- /dev/null +++ b/db/init.sh @@ -0,0 +1,6 @@ +db_name=$1 +db_user=$2 +db_pass=$3 + +CREATE USER $db_user PASSWORD '$db_pass'; +CREATE DATABASE $db_user OWNER=$db_user; \ No newline at end of file diff --git a/html/index.html b/html/index.html index 102398e..b050fd5 100644 --- a/html/index.html +++ b/html/index.html @@ -3,13 +3,15 @@ - My Telegram Mini App - + JBond telegram web app + - - + + + + @@ -17,11 +19,11 @@
- +
-
- +
@@ -55,6 +57,16 @@
+
+ +
+
+ +
+
+
+
+
diff --git a/html/nouislider/nouislider.js b/html/nouislider/nouislider.js index 2d3e054..5dbb1d3 100644 --- a/html/nouislider/nouislider.js +++ b/html/nouislider/nouislider.js @@ -1796,17 +1796,17 @@ scope_Events[targetEvent].forEach(function (callback) { callback.call( // Use the slider public API as the scope ('this') - scope_Self, + scope_Self, // Return values as array, so arg_1[arg_2] is always valid. - scope_Values.map(options.format.to), + scope_Values.map(options.format.to), // Handle index, 0 or 1 - handleNumber, + handleNumber, // Un-formatted slider values - scope_Values.slice(), + scope_Values.slice(), // Event is fired by tap, true or false - tap || false, + tap || false, // Left offset of the handle, in relation to the slider - scope_Locations.slice(), + scope_Locations.slice(), // add the slider public API to an accessible parameter when this is unavailable scope_Self); }); @@ -2251,7 +2251,7 @@ // Invert options for connect handles function invertConnects() { scope_ConnectsInverted = !scope_ConnectsInverted; - testConnect(options, + testConnect(options, // inverse the connect boolean array options.connect.map(function (b) { return !b; })); updateConnectOption(); diff --git a/html/script.js b/html/script.js index 3f51ead..0758bdc 100644 --- a/html/script.js +++ b/html/script.js @@ -1,3 +1,22 @@ + + + +// import { parse } from './module.js'; + +// var config = toml.parse("/opt/jbond/jbond.toml"); + +// $.get('/config/settings.toml', function (data) { +// var config = toml.parse(data); +// console.log(config); +// }); + + +// fs.readFile('/config/settings.toml', function (err, data) { +// var parsed = toml.parse(data); +// console.log(parsed); +// }); + + let tg = window.Telegram.WebApp; tg.expand(); // Expand the app to full screen @@ -57,22 +76,22 @@ noUiSlider.create(durationSlider, { connect: true, range: { 'min': 0, - 'max': 100 + 'max': 120 } }); -var duration_from = document.getElementById('duration-from'); -var duration_to = document.getElementById('duration-to'); -var durations = [duration_from, duration_to]; +var durationFrom = document.getElementById('duration-from'); +var durationTo = document.getElementById('duration-to'); +var durations = [durationFrom, durationTo]; durationSlider.noUiSlider.on('update', function (values, handle) { durations[handle].value = Math.round(values[handle]); }); -duration_from.addEventListener('change', function () { +durationFrom.addEventListener('change', function () { durationSlider.noUiSlider.set([null, this.value]); }); -duration_to.addEventListener('change', function () { +durationTo.addEventListener('change', function () { durationSlider.noUiSlider.set([null, this.value]); }); @@ -89,18 +108,18 @@ noUiSlider.create(fullProfitSlider, { } }); -var full_profit_from = document.getElementById('full-profit-from'); -var full_profit_to = document.getElementById('full-profit-to'); -var full_profits = [full_profit_from, full_profit_to]; +var duratfullProfitFrom = document.getElementById('full-profit-from'); +var duratfullProfitTo = document.getElementById('full-profit-to'); +var fullProfits = [duratfullProfitFrom, duratfullProfitTo]; fullProfitSlider.noUiSlider.on('update', function (values, handle) { - full_profits[handle].value = Math.round(values[handle]*2)/2; + fullProfits[handle].value = Math.round(values[handle]*2)/2; }); -full_profit_from.addEventListener('change', function () { +duratfullProfitFrom.addEventListener('change', function () { fullProfitSlider.noUiSlider.set([null, this.value]); }); -full_profit_to.addEventListener('change', function () { +duratfullProfitTo.addEventListener('change', function () { fullProfitSlider.noUiSlider.set([null, this.value]); }); @@ -117,18 +136,52 @@ noUiSlider.create(divProfitSlider, { } }); -var div_profit_from = document.getElementById('div-profit-from'); -var div_profit_to = document.getElementById('div-profit-to'); -var div_profits = [div_profit_from, div_profit_to]; +var divProfitFrom = document.getElementById('div-profit-from'); +var divProfitTo = document.getElementById('div-profit-to'); +var divProfits = [divProfitFrom, divProfitTo]; divProfitSlider.noUiSlider.on('update', function (values, handle) { - div_profits[handle].value = Math.round(values[handle]*2)/2; + divProfits[handle].value = Math.round(values[handle]*2)/2; }); -div_profit_from.addEventListener('change', function () { +divProfitFrom.addEventListener('change', function () { divProfitSlider.noUiSlider.set([null, this.value]); }); -div_profit_to.addEventListener('change', function () { +divProfitTo.addEventListener('change', function () { divProfitSlider.noUiSlider.set([null, this.value]); }); + + +//Слайдер рейтинга +var ratings = ['BB-','BB','BB+','BBB-','BBB','BBB+','A-','A','A+','AA-','AA','AA+','AAA-','AAA']; +var ratingFormat = { + to: function(value) { + return ratings[value]; + }, + from: function (value) { + return ratings.indexOf(value); + } +}; + +var ratingSlider = document.getElementById('rating-slider'); +var ratingFrom = document.getElementById('rating-from'); + +noUiSlider.create(ratingSlider, { + start: ['A-'], + connect: 'upper', + format: ratingFormat, + step: 1, + range: { + 'min': 0, + 'max': ratings.length - 1 + } +}); + +ratingSlider.noUiSlider.on('update', function (value) { + ratingFrom.value = value; +}); + +ratingFrom.addEventListener('change', function () { + ratingSlider.noUiSlider.set([this.value]); +}); diff --git a/html/style.css b/html/style.css index 292bc90..232ebb6 100644 --- a/html/style.css +++ b/html/style.css @@ -75,7 +75,7 @@ button:active { right: 32px; } -input[type='number']{ +input[type='number'] { width: 80px; padding: 7px; text-align: center; @@ -86,6 +86,18 @@ input[type='number']{ color: #585858; } +input[type='text'] { + width: 80px; + padding: 7px; + text-align: center; + border: 1px solid #c8c8c8; + border-radius: 5px; + font-size: 18px; + line-height: 18px; + color: #585858; + margin-bottom: 20px; +} + input[type='checkbox']{ transform: scale(2); margin: 10px 10px; @@ -96,6 +108,10 @@ input[type='checkbox']{ margin: 10px 0px 0px; } +.single-slider { + margin-top: 50px +} + .slider .noUi-connect { background: #c0392b; } diff --git a/src/http_server.py b/src/http_server.py index 014203e..9f7cf30 100644 --- a/src/http_server.py +++ b/src/http_server.py @@ -3,7 +3,6 @@ from threading import Thread import ssl import mimetypes -from config import config logger = logging.getLogger("Http") @@ -20,7 +19,6 @@ def do_POST(self): else: self.send_response(400) - self.send_header('Host': f'{address}:{port}') self.send_header('Content-Length', 0) self.send_header('Connection', 'close') self.end_headers() @@ -38,7 +36,6 @@ def do_GET(self): with open(path, 'rb') as file: content = file.read() self.send_response(200) - self.send_header('Host': f'{address}:{port}') self.send_header('Content-Type', f'{mime_type}') self.send_header('Content-Length', len(content)) self.send_header('Connection', 'close') @@ -47,7 +44,6 @@ def do_GET(self): except: self.send_response(404) - self.send_header('Host': f'{address}:{port}') self.send_header('Content-Length', 0) self.send_header('Connection', 'close') self.end_headers() From 5572a18e2c06cbf112a94b60d48fa20fd7c42deb Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 11:25:58 +0300 Subject: [PATCH 03/48] create db --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e4ed39..836b871 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,8 @@ jobs: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl start postgresql" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'sh $DIRECTORY/db/init.sh $DB_NAME $DB_USER $DB_PASS'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass';" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" # - name: Install some html stuff From d8e9981e770dd5cab5ba3f17520d158336895a01 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 11:26:51 +0300 Subject: [PATCH 04/48] create db --- .github/workflows/ci.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 836b871..c24de26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,19 +37,6 @@ jobs: python3 -m ensurepip python3 -m venv /opt/certbot/ pip3 install aiogram tomli certbot - - name: Install postgresql - run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "yes | yum install postgresql-server" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "postgresql-setup --initdb --unit postgresql" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/' > $PG_HBA - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/' > $PG_HBA - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl start postgresql" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass';" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" - # - name: Install some html stuff # run: | @@ -65,6 +52,18 @@ jobs: cat ~/.ssh/id_rsa ssh-keyscan -H ${{ secrets.JBOND_SSH_HOST }} > ~/.ssh/known_hosts + - name: Install postgresql + run: | + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "yes | yum install postgresql-server" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "postgresql-setup --initdb --unit postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/' > $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/' > $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl start postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass';" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" - name: clone repo From 30e27cc1b8426dcb9ee3f2f95109fd3cd518ca27 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 11:27:52 +0300 Subject: [PATCH 05/48] create db --- .github/workflows/ci.yml | 2 +- db/init.sh | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 db/init.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c24de26..562c434 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl start postgresql" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass';" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass;'" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" diff --git a/db/init.sh b/db/init.sh deleted file mode 100644 index e820791..0000000 --- a/db/init.sh +++ /dev/null @@ -1,6 +0,0 @@ -db_name=$1 -db_user=$2 -db_pass=$3 - -CREATE USER $db_user PASSWORD '$db_pass'; -CREATE DATABASE $db_user OWNER=$db_user; \ No newline at end of file From 9b7f631ce1ce5516d57ff99d9f8333dc2d0ac048 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 12:24:46 +0300 Subject: [PATCH 06/48] fix --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 562c434..52792e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,6 +53,7 @@ jobs: ssh-keyscan -H ${{ secrets.JBOND_SSH_HOST }} > ~/.ssh/known_hosts - name: Install postgresql + continue-on-error: true run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "yes | yum install postgresql-server" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "postgresql-setup --initdb --unit postgresql" @@ -64,6 +65,7 @@ jobs: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl start postgresql" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass;'" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" + - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" - name: clone repo From c48f452b777859feb26f76127bfafdd7a639dc10 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 12:35:49 +0300 Subject: [PATCH 07/48] fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52792e4..35a4e09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: - name: clone repo run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -rf $DIRECTORY && git clone https://github.com/andrevis/jbond.git $DIRECTORY" - name: checkout-pull - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cd $DIRECTORY && git checkout $BRANCH && git pull origin $BRANCH" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cd $DIRECTORY && git checkout $BRANCH -- && git pull origin $BRANCH" - name: stop service run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl stop jbond.service && systemctl disable jbond.service" # - name: gen self-signed ssl keys From 147e4f7741ae48509daa0613eb2c30f7c792072b Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 12:40:06 +0300 Subject: [PATCH 08/48] fix --- .github/workflows/ci.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35a4e09..c129b87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,17 +52,30 @@ jobs: cat ~/.ssh/id_rsa ssh-keyscan -H ${{ secrets.JBOND_SSH_HOST }} > ~/.ssh/known_hosts + - name: Start postgresql + continue-on-error: true + run: | + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl stop postgresql && systemctl disable postgresql" + - name: Install postgresql continue-on-error: true run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "yes | yum install postgresql-server" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "postgresql-setup --initdb --unit postgresql" + + - name: Init postgresql cfg + run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/' > $PG_HBA ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/' > $PG_HBA ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl start postgresql" + + - name: Start postgresql + run: | + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" + + - name: Create postgresql db + run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass;'" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" From 93ab69e7f9f83c1084c18f7f7c23786f6934e7b7 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 12:43:54 +0300 Subject: [PATCH 09/48] fix --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c129b87..e3cee4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: PORT: 8080 CRON_CERT_RENEW_JOB: '30 4 * * * /usr/bin/certbot renew --quiet' CRON_CERT_RENEW_FILE: certbot.renew.cron - PG_HBA: /var/lib/pgsql/data/pg_hba.conf + PG_HBA: '/var/lib/pgsql/data/pg_hba.conf' DB_NAME: jbond_db DB_USER: jbond DB_PASS: jbond @@ -65,10 +65,10 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/' > $PG_HBA - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/' > $PG_HBA - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/' > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/' > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" - name: Start postgresql run: | From 43cc674ed550a414bc9b1b18abaef54149917f64 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 12:54:20 +0300 Subject: [PATCH 10/48] fix --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3cee4a..101f786 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,6 +65,7 @@ jobs: - name: Init postgresql cfg run: | + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA $PG_HBA.bkp" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/' > $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/' > $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" From 4431f2b01f9d325bb2f916bffb15eec681171413 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:07:54 +0300 Subject: [PATCH 11/48] fixip --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 101f786..fcf229a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: PORT: 8080 CRON_CERT_RENEW_JOB: '30 4 * * * /usr/bin/certbot renew --quiet' CRON_CERT_RENEW_FILE: certbot.renew.cron - PG_HBA: '/var/lib/pgsql/data/pg_hba.conf' + PG_HBA: /var/lib/pgsql/data/pg_hba.conf DB_NAME: jbond_db DB_USER: jbond DB_PASS: jbond @@ -66,11 +66,11 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA $PG_HBA.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/' > $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/' > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo \"$(cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/g')\" > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo \"$(cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/g')\" > $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" - + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "chown postgres:postgres $PG_HBA" - name: Start postgresql run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" From bd1fadaeddf50b08ec11a8080cf5e2a2d4629341 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:18:16 +0300 Subject: [PATCH 12/48] fixip --- .github/workflows/ci.yml | 62 +++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcf229a..9a87ad5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,65 +55,63 @@ jobs: - name: Start postgresql continue-on-error: true run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl stop postgresql && systemctl disable postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl stop postgresql && systemctl disable postgresql' - name: Install postgresql continue-on-error: true run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "yes | yum install postgresql-server" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "postgresql-setup --initdb --unit postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'yes | yum install postgresql-server' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'postgresql-setup --initdb --unit postgresql' - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA $PG_HBA.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo \"$(cat $PG_HBA | sed -E 's/^local\s+all\s+postgres.*/# \0/g')\" > $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo \"$(cat $PG_HBA | sed -E 's/host\s+$DB_NAME\s+$DB_USER.*/# \0/g')\" > $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'local all postgres trust' >> $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'host $DB_NAME $DB_USER password' >> $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "chown postgres:postgres $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $PG_HBA $PG_HBA.bkp' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/host\s+$DB_NAME\s+$DB_USER.*/# \0/g")" > $PG_HBA' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "local all postgres trust" >> $PG_HBA' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "host $DB_NAME $DB_USER password" >> $PG_HBA' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'chown postgres:postgres $PG_HBA' - name: Start postgresql run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl enable postgresql && systemctl start postgresql' - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass;'" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'psql -U postgres -c "CREATE USER $db_user PASSWORD $db_pass;"' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'psql -U postgres -c "CREATE DATABASE $db_user OWNER=$db_user;"' - name: open port - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'firewall-cmd --zone=public --add-port=$PORT/tcp --permanent' - name: clone repo - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -rf $DIRECTORY && git clone https://github.com/andrevis/jbond.git $DIRECTORY" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'rm -rf $DIRECTORY && git clone https://github.com/andrevis/jbond.git $DIRECTORY' - name: checkout-pull - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cd $DIRECTORY && git checkout $BRANCH -- && git pull origin $BRANCH" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cd $DIRECTORY && git checkout $BRANCH -- && git pull origin $BRANCH' - name: stop service - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl stop jbond.service && systemctl disable jbond.service" - # - name: gen self-signed ssl keys - # run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "openssl req -new -nodes -batch -x509 -newkey rsa:2048 -keyout $DIRECTORY/key.pem -out $DIRECTORY/cert.pem -days 365 -subj '/C=RU/CN=185.68.21.112'" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl stop jbond.service && systemctl disable jbond.service' - name: gen cert - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "certbot certonly --standalone -n -d $ADDR -d www.$ADDR" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'certbot certonly --standalone -n -d $ADDR -d www.$ADDR' - name: Add certbot renew job run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab -l | sed '/certbot renew/d' > $CRON_CERT_RENEW_FILE" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '$CRON_CERT_RENEW_JOB' >> $CRON_CERT_RENEW_FILE" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab $CRON_CERT_RENEW_FILE" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'crontab -l | sed "/certbot renew/d" > $CRON_CERT_RENEW_FILE' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$CRON_CERT_RENEW_JOB" >> $CRON_CERT_RENEW_FILE' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'crontab $CRON_CERT_RENEW_FILE' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'rm -f $CRON_CERT_RENEW_FILE' - name: gen config run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '[server]' > $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'address = \"$ADDR\"' >> $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'port = $PORT' >> $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '' >> $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '[bot]' >> $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'token = \"${{ secrets.JBOND_BOT_TOKEN }}\"' >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "[server]" > $DIRECTORY/jbond.toml' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "address = \"$ADDR\"" >> $DIRECTORY/jbond.toml' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "port = $PORT" >> $DIRECTORY/jbond.toml' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "" >> $DIRECTORY/jbond.toml' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "[bot]" >> $DIRECTORY/jbond.toml' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "token = \"${{ secrets.JBOND_BOT_TOKEN }}\"" >> $DIRECTORY/jbond.toml' - name: setup service - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $DIRECTORY/misc/jbond.service /usr/lib/systemd/system/" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $DIRECTORY/misc/jbond.service /usr/lib/systemd/system/' - name: enable service - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl daemon-reload && systemctl enable jbond.service && systemctl restart jbond.service" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl daemon-reload && systemctl enable jbond.service && systemctl restart jbond.service' - name: setup logrotate - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $DIRECTORY/misc/jbond_logrotate /etc/logrotate.d/ && systemctl restart crond" + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $DIRECTORY/misc/jbond_logrotate /etc/logrotate.d/ && systemctl restart crond' - name: cleanup keys if: always() run: rm -rf ~/.ssh/id_rsa \ No newline at end of file From da93b2304e8882efa23b9e042947db355c71d60d Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:20:49 +0300 Subject: [PATCH 13/48] fixip --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a87ad5..70319d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,9 +65,9 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $PG_HBA $PG_HBA.bkp' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/host\s+$DB_NAME\s+$DB_USER.*/# \0/g")" > $PG_HBA' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f "$PG_HBA" "$PG_HBA.bkp"' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+$DB_NAME\s+$DB_USER.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "local all postgres trust" >> $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "host $DB_NAME $DB_USER password" >> $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'chown postgres:postgres $PG_HBA' From daf7aaafd700518fb24b3ca50bb36142dc5ffe0f Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:22:03 +0300 Subject: [PATCH 14/48] fixip --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70319d0..6b84787 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f "$PG_HBA" "$PG_HBA.bkp"' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $PG_HBA $PG_HBA.bkp' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+$DB_NAME\s+$DB_USER.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "local all postgres trust" >> $PG_HBA' From 6ca97dca7118541315f8f7cf2614acaa37cbf7f6 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:24:02 +0300 Subject: [PATCH 15/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b84787..e491a34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: PORT: 8080 CRON_CERT_RENEW_JOB: '30 4 * * * /usr/bin/certbot renew --quiet' CRON_CERT_RENEW_FILE: certbot.renew.cron - PG_HBA: /var/lib/pgsql/data/pg_hba.conf + PG_HBA: "/var/lib/pgsql/data/pg_hba.conf" DB_NAME: jbond_db DB_USER: jbond DB_PASS: jbond @@ -65,7 +65,7 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $PG_HBA $PG_HBA.bkp' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $PG_HBA ${PG_HBA}.bkp' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+$DB_NAME\s+$DB_USER.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "local all postgres trust" >> $PG_HBA' From c419cf0804a0875d0093d48f750599bb284db679 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:27:58 +0300 Subject: [PATCH 16/48] fixip --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e491a34..a604739 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: cat ~/.ssh/id_rsa ssh-keyscan -H ${{ secrets.JBOND_SSH_HOST }} > ~/.ssh/known_hosts - - name: Start postgresql + - name: Stop postgresql continue-on-error: true run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl stop postgresql && systemctl disable postgresql' @@ -65,12 +65,13 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $PG_HBA ${PG_HBA}.bkp' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $PG_HBA ${PG_HBA}_bkp' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+$DB_NAME\s+$DB_USER.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "local all postgres trust" >> $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "host $DB_NAME $DB_USER password" >> $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'chown postgres:postgres $PG_HBA' + - name: Start postgresql run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl enable postgresql && systemctl start postgresql' From 9635e44c9ff6fe803b870e56adf52fc61429becd Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:30:57 +0300 Subject: [PATCH 17/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a604739..ccb1bc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,9 +65,9 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $PG_HBA ${PG_HBA}_bkp' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f "$PG_HBA" "${PG_HBA}.bkp"' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+$DB_NAME\s+$DB_USER.*/# \0/g")" > $PG_HBA' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "local all postgres trust" >> $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "host $DB_NAME $DB_USER password" >> $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'chown postgres:postgres $PG_HBA' From 1c9edab6cb5912bf96579fe158a6da028845a548 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:32:02 +0300 Subject: [PATCH 18/48] fixip --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccb1bc2..a2a7164 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: PORT: 8080 CRON_CERT_RENEW_JOB: '30 4 * * * /usr/bin/certbot renew --quiet' CRON_CERT_RENEW_FILE: certbot.renew.cron - PG_HBA: "/var/lib/pgsql/data/pg_hba.conf" + PG_HBA: /var/lib/pgsql/data/pg_hba.conf DB_NAME: jbond_db DB_USER: jbond DB_PASS: jbond From 9e8b4d620de2434a40629b1e29dc3d09560d79f0 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:38:04 +0300 Subject: [PATCH 19/48] fixip --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2a7164..8ca9a48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,13 +65,16 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f "$PG_HBA" "${PG_HBA}.bkp"' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "cp -f $PG_HBA ${PG_HBA}.bkp" > /home/test.txt' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/g")" > $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "local all postgres trust" >> $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "host $DB_NAME $DB_USER password" >> $PG_HBA' ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'chown postgres:postgres $PG_HBA' + +# ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f "$PG_HBA" "${PG_HBA}.bkp"' + - name: Start postgresql run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl enable postgresql && systemctl start postgresql' From 25df970c76d1531737504f1d04657f51d3a3ee53 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:54:16 +0300 Subject: [PATCH 20/48] fixip --- .github/workflows/ci.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ca9a48..8c26095 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: - name: Stop postgresql continue-on-error: true run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl stop postgresql && systemctl disable postgresql' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl stop postgresql && systemctl disable postgresql - name: Install postgresql continue-on-error: true @@ -65,15 +65,13 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "cp -f $PG_HBA ${PG_HBA}.bkp" > /home/test.txt' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/g")" > $PG_HBA' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "local all postgres trust" >> $PG_HBA' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "host $DB_NAME $DB_USER password" >> $PG_HBA' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'chown postgres:postgres $PG_HBA' - - -# ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f "$PG_HBA" "${PG_HBA}.bkp"' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo 'cp -f $PG_HBA ${PG_HBA}.bkp' > /home/test.txt + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} cp -f $PG_HBA ${PG_HBA}.bkp + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/g")" > $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo "local all postgres trust" >> $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo "host $DB_NAME $DB_USER password" >> $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} chown postgres:postgres $PG_HBA - name: Start postgresql run: | From b4dcb33d7b5315cc96e9a3e07a9f65443aa02c48 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 13:56:48 +0300 Subject: [PATCH 21/48] fixip --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c26095..a035242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,13 +65,13 @@ jobs: - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo 'cp -f $PG_HBA ${PG_HBA}.bkp' > /home/test.txt - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} cp -f $PG_HBA ${PG_HBA}.bkp - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/g")" > $PG_HBA - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo "local all postgres trust" >> $PG_HBA - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} echo "host $DB_NAME $DB_USER password" >> $PG_HBA - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} chown postgres:postgres $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'cp -f $PG_HBA ${PG_HBA}.bkp' > /home/test.txt" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/g")" > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER password" >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "chown postgres:postgres $PG_HBA" - name: Start postgresql run: | From 3ef7ccad124f9299834db7446d18b459ad640fc0 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:01:28 +0300 Subject: [PATCH 22/48] fixip --- .github/workflows/ci.yml | 51 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a035242..4f4ced2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,65 +55,64 @@ jobs: - name: Stop postgresql continue-on-error: true run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl stop postgresql && systemctl disable postgresql + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl stop postgresql && systemctl disable postgresql" - name: Install postgresql continue-on-error: true run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'yes | yum install postgresql-server' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'postgresql-setup --initdb --unit postgresql' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "yes | yum install postgresql-server" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "postgresql-setup --initdb --unit postgresql" - name: Init postgresql cfg run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'cp -f $PG_HBA ${PG_HBA}.bkp' > /home/test.txt" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/g")" > $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER password" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "chown postgres:postgres $PG_HBA" - name: Start postgresql run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl enable postgresql && systemctl start postgresql' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'psql -U postgres -c "CREATE USER $db_user PASSWORD $db_pass;"' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'psql -U postgres -c "CREATE DATABASE $db_user OWNER=$db_user;"' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass;'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" - name: open port - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'firewall-cmd --zone=public --add-port=$PORT/tcp --permanent' + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" - name: clone repo - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'rm -rf $DIRECTORY && git clone https://github.com/andrevis/jbond.git $DIRECTORY' + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -rf $DIRECTORY && git clone https://github.com/andrevis/jbond.git $DIRECTORY" - name: checkout-pull - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cd $DIRECTORY && git checkout $BRANCH -- && git pull origin $BRANCH' + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cd $DIRECTORY && git checkout $BRANCH -- && git pull origin $BRANCH" - name: stop service - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl stop jbond.service && systemctl disable jbond.service' + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl stop jbond.service && systemctl disable jbond.service" - name: gen cert - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'certbot certonly --standalone -n -d $ADDR -d www.$ADDR' + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "certbot certonly --standalone -n -d $ADDR -d www.$ADDR" - name: Add certbot renew job run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'crontab -l | sed "/certbot renew/d" > $CRON_CERT_RENEW_FILE' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "$CRON_CERT_RENEW_JOB" >> $CRON_CERT_RENEW_FILE' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'crontab $CRON_CERT_RENEW_FILE' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'rm -f $CRON_CERT_RENEW_FILE' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab -l | sed "/certbot renew/d" > $CRON_CERT_RENEW_FILE" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$CRON_CERT_RENEW_JOB" >> $CRON_CERT_RENEW_FILE" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab $CRON_CERT_RENEW_FILE" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" - name: gen config run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "[server]" > $DIRECTORY/jbond.toml' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "address = \"$ADDR\"" >> $DIRECTORY/jbond.toml' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "port = $PORT" >> $DIRECTORY/jbond.toml' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "" >> $DIRECTORY/jbond.toml' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "[bot]" >> $DIRECTORY/jbond.toml' - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'echo "token = \"${{ secrets.JBOND_BOT_TOKEN }}\"" >> $DIRECTORY/jbond.toml' + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "[server]" > $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "address = \"$ADDR\"" >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "port = $PORT" >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "" >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "[bot]" >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "token = \"${{ secrets.JBOND_BOT_TOKEN }}\"" >> $DIRECTORY/jbond.toml" - name: setup service - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $DIRECTORY/misc/jbond.service /usr/lib/systemd/system/' + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $DIRECTORY/misc/jbond.service /usr/lib/systemd/system/" - name: enable service - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'systemctl daemon-reload && systemctl enable jbond.service && systemctl restart jbond.service' + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl daemon-reload && systemctl enable jbond.service && systemctl restart jbond.service" - name: setup logrotate - run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'cp -f $DIRECTORY/misc/jbond_logrotate /etc/logrotate.d/ && systemctl restart crond' + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $DIRECTORY/misc/jbond_logrotate /etc/logrotate.d/ && systemctl restart crond" - name: cleanup keys if: always() run: rm -rf ~/.ssh/id_rsa \ No newline at end of file From cd64ef6e99a9d352b65bba1d145f540d80f090ec Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:02:55 +0300 Subject: [PATCH 23/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f4ced2..a39654d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,8 +66,8 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/g")" > $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/g")" > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/")" > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/")" > $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER password" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "chown postgres:postgres $PG_HBA" From 6f9e481309569117399f76987297c224df809a88 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:18:00 +0300 Subject: [PATCH 24/48] fixip --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a39654d..e2974cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,12 +66,11 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/")" > $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/")" > $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local $DB_NAME postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER password" >> $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "chown postgres:postgres $PG_HBA" + # ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} ""$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/")" > $PG_HBA" + # ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/")" > $PG_HBA" - name: Start postgresql run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" From eb51d8fb7de8eaff9f956fb90bdd2f1fd8cd50a6 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:24:21 +0300 Subject: [PATCH 25/48] fixip --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2974cb..1a5f20e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,11 +66,10 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "$(cat $PG_HBA | sed -E "s/^.*${DB_NAME}.*/# \0/") > $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local $DB_NAME postgres trust" >> $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER password" >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" - # ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} ""$(cat $PG_HBA | sed -E "s/^\s*local\s+all\s+postgres.*/# \0/")" > $PG_HBA" - # ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$(cat $PG_HBA | sed -E "s/^\s*host\s+${DB_NAME}\s+${DB_USER}.*/# \0/")" > $PG_HBA" - name: Start postgresql run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" From 61a6947d7838757ca4a4a4377e6937c32b3a5da3 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:32:12 +0300 Subject: [PATCH 26/48] fixip --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a5f20e..0e95439 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "$(cat $PG_HBA | sed -E "s/^.*${DB_NAME}.*/# \0/") > $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i '/$DB_NAME/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local $DB_NAME postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" From ed606c99f7e8188bc1bc8281f0d18a981d43a4b1 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:41:09 +0300 Subject: [PATCH 27/48] fixip --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e95439..3a33552 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,6 +66,7 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -ie '/local\s+all\s+all\s+peer/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i '/$DB_NAME/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local $DB_NAME postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" From a42f96bc79a82d9e9684865e3c99618ca49cf052 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:43:08 +0300 Subject: [PATCH 28/48] fixip --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a33552..59a5f35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -ie '/local\s+all\s+all\s+peer/d' $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -ie '/local\s+all\s+all/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i '/$DB_NAME/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local $DB_NAME postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" @@ -77,8 +77,8 @@ jobs: - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $db_user PASSWORD $db_pass;'" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $db_user OWNER=$db_user;'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $DB_USER PASSWORD $DB_PASS;'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $DB_NAME OWNER=$DB_USER;'" - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" From a3de02925640ee918d454b96c332a312678f6859 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:45:52 +0300 Subject: [PATCH 29/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59a5f35..c13650b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -ie '/local\s+all\s+all/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i '/$DB_NAME/d' $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local $DB_NAME postgres trust" >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" - name: Start postgresql @@ -77,7 +77,7 @@ jobs: - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $DB_USER PASSWORD $DB_PASS;'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $DB_USER PASSWORD "$DB_PASS";'" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $DB_NAME OWNER=$DB_USER;'" - name: open port From f219292e396c32a3a33ca77f31c6b363746a373c Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:49:09 +0300 Subject: [PATCH 30/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c13650b..7a9e8b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,8 +77,8 @@ jobs: - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER $DB_USER PASSWORD "$DB_PASS";'" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE $DB_NAME OWNER=$DB_USER;'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER $DB_USER PASSWORD '$DB_PASS';"" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE $DB_NAME OWNER=$DB_USER;"" - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" From 5bfab17159cc7e730f74835f9deed0c5f14a8a66 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:52:43 +0300 Subject: [PATCH 31/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a9e8b7..025d060 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,8 +77,8 @@ jobs: - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER $DB_USER PASSWORD '$DB_PASS';"" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE $DB_NAME OWNER=$DB_USER;"" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';"" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};"" - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" From 6bb5c32051676c6074829fbd4cfbdea2d9c3160c Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:55:39 +0300 Subject: [PATCH 32/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 025d060..9d7a9e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,8 +77,8 @@ jobs: - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';"" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};"" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c \'CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';\'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c \'CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};\'" - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" From d0c3d7a7b877257bb21eca8b46c5b1f94471b6ed Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 14:58:33 +0300 Subject: [PATCH 33/48] fixip --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d7a9e4..893df12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -ie '/local\s+all\s+all/d' $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -iE '/local\s+all/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i '/$DB_NAME/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" @@ -77,8 +77,8 @@ jobs: - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c \'CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';\'" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c \'CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};\'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};'" - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" From 4f63b4480596ee8eb4931692eb3d4872441c7a91 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:02:33 +0300 Subject: [PATCH 34/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 893df12..6270e70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,8 +77,8 @@ jobs: - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';'" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c 'CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};'" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER ${DB_USER} PASSWORD '${DB_PASS}';"" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};"" - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" From 1ccdb53cfc3b7a14f88ac2a656cb69b40151976f Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:04:59 +0300 Subject: [PATCH 35/48] fixip --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6270e70..e2bd995 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -iE '/local\s+all/d' $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i -E '/local\s+all/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i '/$DB_NAME/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" @@ -77,7 +77,7 @@ jobs: - name: Create postgresql db run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER ${DB_USER} PASSWORD '${DB_PASS}';"" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';"" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};"" - name: open port From 4d85c283a0cf4af3cd95b1538992c8f9057ed0a4 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:10:39 +0300 Subject: [PATCH 36/48] fixip --- .github/workflows/ci.yml | 11 +++++++++-- db/init.sh | 8 ++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 db/init.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2bd995..4b7b075 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,12 +74,19 @@ jobs: - name: Start postgresql run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" - - - name: Create postgresql db + - name: Create postgresql db run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';"" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};"" + - name: Create postgresql db + run: $DIRECTORY/db/init.sh + + # - name: Create postgresql db + # run: | + # ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';"" + # ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};"" + - name: open port run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "firewall-cmd --zone=public --add-port=$PORT/tcp --permanent" - name: clone repo diff --git a/db/init.sh b/db/init.sh new file mode 100644 index 0000000..1bf5d64 --- /dev/null +++ b/db/init.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +db_name=$1 +db_user=$2 +db_pass=$3 + +psql -U postgres -c "CREATE USER ${db_name} PASSWORD '${db_pass}';" +psql -U postgres -c "CREATE DATABASE ${db_name} OWNER=${db_user};" \ No newline at end of file From 034a71b075e1661bb70e6977d838a641971e2bfc Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:11:05 +0300 Subject: [PATCH 37/48] fixip --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b7b075..3581119 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,13 +74,9 @@ jobs: - name: Start postgresql run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" - - name: Create postgresql db - run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE USER ${DB_USER} PASSWORD \'${DB_PASS}\';"" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "psql -U postgres -c "CREATE DATABASE ${DB_NAME} OWNER=${DB_USER};"" - name: Create postgresql db - run: $DIRECTORY/db/init.sh + run: $DIRECTORY/db/init.sh ${DB_NAME} ${DB_USER} ${DB_PASS} # - name: Create postgresql db # run: | From 3fe1f3a476302d04f825171321c4efcb86eae997 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:13:14 +0300 Subject: [PATCH 38/48] fixip --- .github/workflows/ci.yml | 2 +- db/init.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 db/init.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3581119..c595910 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" - name: Create postgresql db - run: $DIRECTORY/db/init.sh ${DB_NAME} ${DB_USER} ${DB_PASS} + run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "$DIRECTORY/db/init.sh ${DB_NAME} ${DB_USER} ${DB_PASS}" # - name: Create postgresql db # run: | diff --git a/db/init.sh b/db/init.sh old mode 100644 new mode 100755 From 9ccbb7cac858fa6ea75f84888f8b2b4978dcad77 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:15:15 +0300 Subject: [PATCH 39/48] fixip --- db/init.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/init.sh b/db/init.sh index 1bf5d64..dbc294c 100755 --- a/db/init.sh +++ b/db/init.sh @@ -4,5 +4,6 @@ db_name=$1 db_user=$2 db_pass=$3 -psql -U postgres -c "CREATE USER ${db_name} PASSWORD '${db_pass}';" + +psql -U postgres -c "CREATE USER ${db_user} PASSWORD '${db_pass}';" psql -U postgres -c "CREATE DATABASE ${db_name} OWNER=${db_user};" \ No newline at end of file From 5058dd87f3d9469b8911fe668da4f08bc056b750 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:30:17 +0300 Subject: [PATCH 40/48] fixip --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c595910..f5b852b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,7 @@ jobs: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i -E '/local\s+all/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i '/$DB_NAME/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local $DB_NAME $DB_USER password" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" - name: Start postgresql From ecbd91e825e65df68f1641d71734adcf96579593 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:33:01 +0300 Subject: [PATCH 41/48] fixip --- .github/workflows/ci.yml | 1 + db/init.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5b852b..6f5ca4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,7 @@ jobs: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "systemctl enable postgresql && systemctl start postgresql" - name: Create postgresql db + continue-on-error: true run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "$DIRECTORY/db/init.sh ${DB_NAME} ${DB_USER} ${DB_PASS}" # - name: Create postgresql db diff --git a/db/init.sh b/db/init.sh index dbc294c..6f37319 100755 --- a/db/init.sh +++ b/db/init.sh @@ -4,6 +4,7 @@ db_name=$1 db_user=$2 db_pass=$3 - +psql -U postgres -c "DROP DATABASE ${db_name};" +psql -U postgres -c "DROP USER ${db_user};" psql -U postgres -c "CREATE USER ${db_user} PASSWORD '${db_pass}';" psql -U postgres -c "CREATE DATABASE ${db_name} OWNER=${db_user};" \ No newline at end of file From 4c861846fe204ceddf626f1c86998dfc4563cb08 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:39:21 +0300 Subject: [PATCH 42/48] fixip --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f5ca4f..0f6c27e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,7 @@ jobs: run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "certbot certonly --standalone -n -d $ADDR -d www.$ADDR" - name: Add certbot renew job run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab -l | sed "/certbot renew/d" > $CRON_CERT_RENEW_FILE" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'crontab -l | sed '/certbot renew/d' > $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$CRON_CERT_RENEW_JOB" >> $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" From 79fee2fd69a6aad64f1116f39d8d8a0fd774e01e Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:39:36 +0300 Subject: [PATCH 43/48] fixip --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f6c27e..aa09384 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,7 @@ jobs: run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "certbot certonly --standalone -n -d $ADDR -d www.$ADDR" - name: Add certbot renew job run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} 'crontab -l | sed '/certbot renew/d' > $CRON_CERT_RENEW_FILE" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab -l | sed '/certbot renew/d' > $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$CRON_CERT_RENEW_JOB" >> $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" From 1235badf96caffb6a7992b4b8a868f0969adc78a Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:45:05 +0300 Subject: [PATCH 44/48] fixip --- .github/workflows/ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa09384..8105847 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: ADDR: ${{ secrets.JBOND_SSH_DOMAIN }} PORT: 8080 CRON_CERT_RENEW_JOB: '30 4 * * * /usr/bin/certbot renew --quiet' - CRON_CERT_RENEW_FILE: certbot.renew.cron + CRON_CERT_RENEW_FILE: ~/certbot.renew.cron PG_HBA: /var/lib/pgsql/data/pg_hba.conf DB_NAME: jbond_db DB_USER: jbond @@ -66,8 +66,8 @@ jobs: - name: Init postgresql cfg run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $PG_HBA ${PG_HBA}.bkp" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i -E '/local\s+all/d' $PG_HBA" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -i '/$DB_NAME/d' $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -n -i -E '/local\s+all/d' $PG_HBA" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "sed -n -i '/$DB_NAME/d' $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local all postgres trust" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "local $DB_NAME $DB_USER password" >> $PG_HBA" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "host $DB_NAME $DB_USER 127.0.0.1/32 password" >> $PG_HBA" @@ -97,7 +97,7 @@ jobs: run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "certbot certonly --standalone -n -d $ADDR -d www.$ADDR" - name: Add certbot renew job run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab -l | sed '/certbot renew/d' > $CRON_CERT_RENEW_FILE" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab -l | sed -n '/certbot renew/d' > $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$CRON_CERT_RENEW_JOB" >> $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" @@ -119,4 +119,6 @@ jobs: run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $DIRECTORY/misc/jbond_logrotate /etc/logrotate.d/ && systemctl restart crond" - name: cleanup keys if: always() - run: rm -rf ~/.ssh/id_rsa \ No newline at end of file + run: | + rm -f ~/.ssh/id_rsa + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" \ No newline at end of file From 1791389b4017874735e9e7bf6d482b0b19f3e9f4 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:48:54 +0300 Subject: [PATCH 45/48] fixip --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8105847..8b2d28e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: DIRECTORY: /opt/jbond ADDR: ${{ secrets.JBOND_SSH_DOMAIN }} PORT: 8080 - CRON_CERT_RENEW_JOB: '30 4 * * * /usr/bin/certbot renew --quiet' + CRON_CERT_RENEW_JOB: "30 4 * * * /usr/bin/certbot renew --quiet" CRON_CERT_RENEW_FILE: ~/certbot.renew.cron PG_HBA: /var/lib/pgsql/data/pg_hba.conf DB_NAME: jbond_db @@ -120,5 +120,5 @@ jobs: - name: cleanup keys if: always() run: | - rm -f ~/.ssh/id_rsa - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" \ No newline at end of file + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" + rm -f ~/.ssh/id_rsa \ No newline at end of file From 2900602b59c5ad7ea0771ea03fc6623adf762ffa Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:53:33 +0300 Subject: [PATCH 46/48] fixip --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b2d28e..6dfa5bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,9 +98,8 @@ jobs: - name: Add certbot renew job run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab -l | sed -n '/certbot renew/d' > $CRON_CERT_RENEW_FILE" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "$CRON_CERT_RENEW_JOB" >> $CRON_CERT_RENEW_FILE" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '$CRON_CERT_RENEW_JOB' >> $CRON_CERT_RENEW_FILE" ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "crontab $CRON_CERT_RENEW_FILE" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" - name: gen config run: | From fdafe90ec4fd5da1c606824aed2371462dec7373 Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 15:57:40 +0300 Subject: [PATCH 47/48] fixip --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6dfa5bc..40f38a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,12 +103,12 @@ jobs: - name: gen config run: | - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "[server]" > $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "address = \"$ADDR\"" >> $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "port = $PORT" >> $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "" >> $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "[bot]" >> $DIRECTORY/jbond.toml" - ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo "token = \"${{ secrets.JBOND_BOT_TOKEN }}\"" >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '[server]' > $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'address = \"$ADDR\"' >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'port = $PORT' >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '' >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo '[bot]' >> $DIRECTORY/jbond.toml" + ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "echo 'token = \"${{ secrets.JBOND_BOT_TOKEN }}\"' >> $DIRECTORY/jbond.toml" - name: setup service run: ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "cp -f $DIRECTORY/misc/jbond.service /usr/lib/systemd/system/" From 8d4446d64b78e1d420992eeae282cde8d53207ea Mon Sep 17 00:00:00 2001 From: andrevis Date: Fri, 27 Jun 2025 16:03:59 +0300 Subject: [PATCH 48/48] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40f38a2..479c957 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: deploy: runs-on: ubuntu-latest env: # Or as an environment variable - BRANCH: html + BRANCH: master DIRECTORY: /opt/jbond ADDR: ${{ secrets.JBOND_SSH_DOMAIN }} PORT: 8080 @@ -120,4 +120,4 @@ jobs: if: always() run: | ssh ${{ secrets.JBOND_SSH_USER }}@${{ secrets.JBOND_SSH_HOST }} "rm -f $CRON_CERT_RENEW_FILE" - rm -f ~/.ssh/id_rsa \ No newline at end of file + rm -f ~/.ssh/id_rsa