proxy version 0.012

Author: bitrequest

assets_js_bitrequest_config.js

@@ -17,7 +17,7 @@ const glob_apptitle = "Bitrequest",
         "https://www.bitrequest.app/"
     ],
     glob_hosted_proxy = random_array_item(glob_proxy_list), // load balance proxies
-    glob_proxy_version = "0.010",
+    glob_proxy_version = "0.012",
     glob_firebase_dynamic_link_domain = "bitrequest.page.link",
     glob_firebase_shortlink = "https://" + glob_firebase_dynamic_link_domain + "/",
     glob_androidpackagename = "io.bitrequest.app",

assets_js_bitrequest_core.js

@@ -908,11 +908,9 @@ function ios_redirections(url) {
     }
     if (gets.i) {
         // expand shorturl don't open page
-    } 
-    else if (gets.data) {
+    } else if (gets.data) {
         glob_w_loc.href = url;
-    }
-    else {
+    } else {
         const pagename = gets.p || "prompt";
         openpage(url, pagename, "page");
     }
@@ -4539,7 +4537,9 @@ function resetchanges() {
     glob_changes = {};
     savechangesstats();
     glob_body.removeClass("haschanges");
-    $("#alert > span").text("0").attr("title", translate("nochanges"));
+    if (!glob_html.hasClass("proxyupdate")) {
+        $("#alert > span").text("0").attr("title", translate("nochanges"));
+    }
 }
 
 // Saves the changes statistics to local storage
@@ -4559,9 +4559,11 @@ function change_alert() {
     }
     const total_changes = get_total_changes();
     if (total_changes > 0) {
-        $("#alert > span").text(total_changes).attr("title", translate("totalchanges", {
-            "total_changes": total_changes
-        }));
+        if (!glob_html.hasClass("proxyupdate")) {
+            $("#alert > span").text(total_changes).attr("title", translate("totalchanges", {
+                "total_changes": total_changes
+            }));
+        }
         setTimeout(function() {
             glob_body.addClass("haschanges");
         }, 2500);
@@ -4685,6 +4687,7 @@ function get_alchemy_apikey() {
 // Displays an alert for proxy updates
 function proxy_alert(version) {
     if (version) {
+        glob_html.addClass("proxyupdate");
         glob_body.addClass("haschanges");
         $("#alert > span").text("!").attr("title", translate("updateproxy", {
             "version": version,

assets_styles_styles.css

@@ -319,20 +319,20 @@ html.hidemain header {
 	transition: all 400ms cubic-bezier(0.5, -0.5, 0.5, 1.5);
 }
 
-html:not(.gdauth) body.haschanges #alert {
+html:not(.gdauth .proxyupdate) body.haschanges #alert {
 	opacity: 1;
 	-webkit-transform: translate(0%, 0);
 	-ms-transform: translate(0%, 0);
 	transform: translate(0%, 0);
 }
 
-html:not(.gdauth) body.haschanges #header h1 {
+html:not(.gdauth .proxyupdate) body.haschanges #header h1 {
 	-webkit-transform: translate(1em, 0);
 	-ms-transform: translate(1em, 0);
 	transform: translate(1em, 0);
 }
 
-html.gdauth #alert {
+html:not(.proxyupdate).gdauth #alert {
 	display: none!important;
 }
 
@@ -2068,9 +2068,11 @@ input:invalid {
 }
 
 .warning {
+	display:inline-block;
 	color: #FFF;
 	background-color: #B33A3A !important;
-	padding-left: 1em;
+	padding: 1em;
+	margin-bottom:0.5em;
 }
 
 .error {

proxy/README.md

@@ -1,28 +1,30 @@
+# Lightning Proxy README
+
 ## Update
 
-Replace the 'v1' folder, make sure you leave the config.php file.
+Replace the 'v1' folder, making sure to leave the config.php file intact.
 
 ## API Proxy
 
 * Control your own keys and request limits.
 * Host this folder on your webserver as your personal API proxy.
 * Enter your API keys in the config.php file.
-* In the bitrequest app go to Settings -> Advanced -> API Proxy and connect to your webserver.
+* In the Bitrequest app, go to Settings -> Advanced -> API Proxy and connect to your webserver.
 
 ## URL Shortener
 
 * Use your webserver for your personal shortlinks.
-* In the bitrequest app go to Settings -> Advanced -> URL Shortener and connect to your proxy server.
+* In the Bitrequest app, go to Settings -> Advanced -> URL Shortener and connect to your proxy server.
 
-## Lightning RPC proxy
+## Lightning RPC Proxy
 
-* Connect your lightning node to the bitrequest app securely.
+* Connect your Lightning node to the Bitrequest app securely.
 * Host this folder on your webserver as your personal Lightning RPC proxy.
-* Enter your lightning Host and keys in the config.php file.
-* In the bitrequest app go to Currencies -> Bitcoin -> Settings -> Lightning Network and connect to your webserver.
-* Select your lightning node.
+* Enter your Lightning host and keys in the config.php file.
+* In the Bitrequest app, go to Currencies -> Bitcoin -> Settings -> Lightning Network and connect to your webserver.
+* Select your Lightning node.
 
-## Lightning setup:
+## Lightning Setup:
 
 ### Connect:
 
@@ -33,22 +35,23 @@ Replace the 'v1' folder, make sure you leave the config.php file.
 
 ### Settings:
 
-* **API key:**  Secure your lightning proxy calls with your personal key. (optional)  
-* **successAction:**  Display a personal message in your clients wallet after a succesfull payment. (optional)  
-* **callback:**  Set callback url to receive status updates. [Documentation and sample templates](https://github.com/bitrequest/webshop-integration/). (optional)  
-* **local_tracking:**  receive callbacks for point of sale requests.
-* **remote_tracking:** receive callbacks for shared requests.  
-* **logo:** Display your logo on lnurl enabled lightning wallets. (512x512px / base-64 encoded) 
+* **API key:**  Secure your Lightning proxy calls with your personal key. (optional)  
+* **successAction:**  Display a personal message in your client's wallet after a successful payment. (optional)  
+* **callback:**  Set callback URL to receive status updates. [Documentation and sample templates](https://github.com/bitrequest/webshop-integration/). (optional)  
+* **local_tracking:**  Receive callbacks for point-of-sale requests.
+* **remote_tracking:** Receive callbacks for shared requests.  
+* **logo:** Display your logo on LNURL-enabled Lightning wallets. (512x512px / base64-encoded) 
 
 ## Lightning API:
 
+Available endpoints:
 * ln-create-invoice
 * ln-invoice-status
 * ln-request-status
 * ln-invoice-decode
 * ln-list-invoices
 
-**Endpoint:** {Api proxy} /proxy/v1/ln/api/
+**Endpoint:** {API proxy}/proxy/v1/ln/api/
 
 imp {$implementation} : "lnd" / "eclair" / "c-lightning" / "lnbits"
 
@@ -58,107 +61,126 @@ POST
 
 Payload:
 
-    {
-      "fn": "ln-create-invoice",
-      "imp": {$implementation},
-      "amount": {$amount},
-      "memo": {$memo},
-      "id": {$unique id} (required for c-lightning label),
-      "expiry": {$expiry} (in seconds),
-      "x-api": {$api-key} (optional),
-    }
+```json
+{
+  "fn": "ln-create-invoice",
+  "imp": "{$implementation}",
+  "amount": "{$amount}",
+  "memo": "{$memo}",
+  "id": "{$unique id}", // required for c-lightning label
+  "expiry": "{$expiry}", // in seconds
+  "x-api": "{$api-key}" // optional
+}
+```
 
 Response:
 
-    {
-      "bolt11": "lnbcrt100n1p3r3zvnpp59xxgzarekeh0dg0qa5hu4ap4xlpjl3jd7v4yhx6cqq5668vv8c8qdp8w3jhxapqd9h8vmmfvdjjqctsdyszsnzw24fyc2gcqzpgxqz95sp5cq3lu0kgawn2djhfa7rq34v539t5lnslnyrsdt7zpxqa4z2zx0kq9qyyssqs6akvn2wsx6wjratycg0wmwqhtmgl0cqw4m0xqhj7cgy4uxk6alsln578y8x66utkch7vkav0kz2zc6yx4pygre27h2vtzrat803pqcqj8wzxp",
-      "hash": "298c817479b66ef6a1e0ed2fcaf43537c32fc64df32a4b9b580029ad1d8c3e0e",
-      "invoice": $decoded bolt11,
-      "proxy": "app.bitrequest.io",
-    }
+```json
+{
+  "bolt11": "lnbcrt100n1p3r3zvnpp59xxgzarekeh0dg0qa5hu4ap4xlpjl3jd7v4yhx6cqq5668vv8c8qdp8w3jhxapqd9h8vmmfvdjjqctsdyszsnzw24fyc2gcqzpgxqz95sp5cq3lu0kgawn2djhfa7rq34v539t5lnslnyrsdt7zpxqa4z2zx0kq9qyyssqs6akvn2wsx6wjratycg0wmwqhtmgl0cqw4m0xqhj7cgy4uxk6alsln578y8x66utkch7vkav0kz2zc6yx4pygre27h2vtzrat803pqcqj8wzxp",
+  "hash": "298c817479b66ef6a1e0ed2fcaf43537c32fc64df32a4b9b580029ad1d8c3e0e",
+  "invoice": "$decoded bolt11",
+  "proxy": "app.bitrequest.io"
+}
+```
 
 ### ln-request-status:
 
 POST  
 
 Payload:
 
-    {
-      "fn": "ln-request-status",
-      "id": {$payment-id},
-      "x-api": {$api-key} (optional),
-    }
+```json
+{
+  "fn": "ln-request-status",
+  "id": "{$payment-id}",
+  "x-api": "{$api-key}" // optional
+}
+```
 
 Response:
 
-    {
-        "pid": {$payment-id},
-        "status": "waiting" / "pending" / "paid" / "canceled",
-        "rqtype": "local" / "checkout" / "outgoing" / "incoming",
-        "proxy": "app.bitrequest.io",
-        "version": "0.001"
-    }
-
+```json
+{
+    "pid": "{$payment-id}",
+    "status": "waiting" | "pending" | "paid" | "canceled",
+    "rqtype": "local" | "checkout" | "outgoing" | "incoming",
+    "proxy": "app.bitrequest.io",
+    "version": "0.001"
+}
+```
 
 ### ln-invoice-status:
 
 POST  
 
 Payload:
 
-    {
-      "fn": "ln-invoice-status",
-      "imp": {$implementation},
-      "hash": {$payment-hash},
-      "x-api": {$api-key} (optional),
-    }
+```json
+{
+  "fn": "ln-invoice-status",
+  "imp": "{$implementation}",
+  "hash": "{$payment-hash}",
+  "x-api": "{$api-key}" // optional
+}
+```
 
 Response:
 
-    {
-        "status": "pending" / "paid" / "canceled",
-        "bolt11": "lnbc3u1p3rvxtvpp5ff3a7s2ltau6y23zm3l7xchk95k98wx0ey5l3jyd5ddzz9u97msqhp5a5y3dq8ac8zusau6wwlm927da6cqvxzzqr70rjtvzqf3q2dhwuxscqpjxqyjw5qrzjqftzw4d5r9nsau4nkakrxxdvkm0xgl6yxwuk4lp9yykz5kql0j5vzzkcgvqq8tgqqqqqqqqqqqqqphgq9qsp52kfc2x26ngwp55g0atdv626d2gqaelww6zm7gsv69nnevucy5shq9qy9qsqqeryqqec8gdlfnmvqcs4swwupw0wv2vzhgdzaew9hmgs3z50gfrr3r6lrkfyrxc2gv92sz7cg8hau40s3n5qwdc6a4s2l4fnh7fv2wgqc3zcsn",
-        "hash": "4a63df415f5f79a22a22dc7fe362f62d2c53b8cfc929f8c88da35a211785f6e0",
-        "amount": "300000",
-        "amount_paid": "300000",
-        "timestamp": "1647712620000",
-        "txtime": "1647712620000",
-        "conf": "1",
-        "proxy": "app.bitrequest.io",
-        "version": "0.001"
-    }
+```json
+{
+    "status": "pending" | "paid" | "canceled",
+    "bolt11": "lnbc3u1p3rvxtvpp5ff3a7s2ltau6y23zm3l7xchk95k98wx0ey5l3jyd5ddzz9u97msqhp5a5y3dq8ac8zusau6wwlm927da6cqvxzzqr70rjtvzqf3q2dhwuxscqpjxqyjw5qrzjqftzw4d5r9nsau4nkakrxxdvkm0xgl6yxwuk4lp9yykz5kql0j5vzzkcgvqq8tgqqqqqqqqqqqqqphgq9qsp52kfc2x26ngwp55g0atdv626d2gqaelww6zm7gsv69nnevucy5shq9qy9qsqqeryqqec8gdlfnmvqcs4swwupw0wv2vzhgdzaew9hmgs3z50gfrr3r6lrkfyrxc2gv92sz7cg8hau40s3n5qwdc6a4s2l4fnh7fv2wgqc3zcsn",
+    "hash": "4a63df415f5f79a22a22dc7fe362f62d2c53b8cfc929f8c88da35a211785f6e0",
+    "amount": "300000",
+    "amount_paid": "300000",
+    "timestamp": "1647712620000",
+    "txtime": "1647712620000",
+    "conf": "1",
+    "proxy": "app.bitrequest.io",
+    "version": "0.001"
+}
+```
 
 ### ln-invoice-decode:
 
 POST  
 
 Payload:
 
-    {
-      "fn": "ln-invoice-decode",
-      "imp": {$implementation},
-      "hash": {$payment-hash},
-      "x-api": {$api-key} (optional),
-    }
+```json
+{
+  "fn": "ln-invoice-decode",
+  "imp": "{$implementation}",
+  "hash": "{$payment-hash}",
+  "x-api": "{$api-key}" // optional
+}
+```
 
 Response:
 
-    {
-        "decoded bolt11 invoice"
-    }
+```json
+{
+    "decoded bolt11 invoice"
+}
+```
 
 ### ln-list-invoices:
 
 POST  
 
 Payload:
 
-    {
-      "fn": "ln-list-invoices",
-      "imp": {$implementation},
-      "x-api": {$api-key} (optional),
-    }
+```json
+{
+  "fn": "ln-list-invoices",
+  "imp": "{$implementation}",
+  "x-api": "{$api-key}" // optional
+}
+```
 
 Response:
 
-    [{bolt 11 invoices}]
+```json
+[{bolt11 invoices}]
+```