[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] 02/06: support http and https
From: |
gnunet |
Subject: |
[taler-wallet-core] 02/06: support http and https |
Date: |
Fri, 10 Mar 2023 05:27:43 +0100 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository wallet-core.
commit 0fb6c098d78de77d100ef405585040118aa61312
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Fri Mar 10 01:21:28 2023 -0300
support http and https
---
packages/web-util/src/live-reload.ts | 3 ++-
packages/web-util/src/serve.ts | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/packages/web-util/src/live-reload.ts
b/packages/web-util/src/live-reload.ts
index 74d542956..48093088a 100644
--- a/packages/web-util/src/live-reload.ts
+++ b/packages/web-util/src/live-reload.ts
@@ -1,7 +1,8 @@
/* eslint-disable no-undef */
function setupLiveReload(): void {
- const ws = new WebSocket("wss://localhost:8080/ws");
+ const protocol = window.location.protocol === "http:" ? "ws:" : "wss:";
+ const ws = new WebSocket(`${protocol}://localhost:8080/ws`);
ws.addEventListener("message", (message) => {
try {
diff --git a/packages/web-util/src/serve.ts b/packages/web-util/src/serve.ts
index 34982c656..597303ba2 100644
--- a/packages/web-util/src/serve.ts
+++ b/packages/web-util/src/serve.ts
@@ -2,6 +2,7 @@ import { Logger } from "@gnu-taler/taler-util";
import chokidar from "chokidar";
import express from "express";
import https from "https";
+import http from "http";
import { parse } from "url";
import WebSocket from "ws";
@@ -30,6 +31,7 @@ export async function serve(opts: {
port: number;
source?: string;
development?: boolean;
+ insecure?: boolean;
examplesLocationJs?: string;
examplesLocationCss?: string;
onUpdate?: () => Promise<void>;
@@ -37,7 +39,9 @@ export async function serve(opts: {
const app = express();
app.use(PATHS.APP, express.static(opts.folder));
- const server = https.createServer(httpServerOptions, app);
+ const server = opts.insecure
+ ? http.createServer(app)
+ : https.createServer(httpServerOptions, app);
logger.info(`serving ${opts.folder} on ${opts.port}`);
logger.info(` ${PATHS.APP}: application`);
logger.info(` ${PATHS.EXAMPLE}: examples`);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-wallet-core] branch master updated (863e6db05 -> 867d2ca76), gnunet, 2023/03/09
- [taler-wallet-core] 01/06: dev mode: check exchange cache, gnunet, 2023/03/09
- [taler-wallet-core] 03/06: add payTemplate, fix missing ampersand, gnunet, 2023/03/09
- [taler-wallet-core] 02/06: support http and https,
gnunet <=
- [taler-wallet-core] 04/06: remove webui from login url, ad qr for template, fix navbar size,, gnunet, 2023/03/09
- [taler-wallet-core] 06/06: fix encoded uri, add pay template cta, gnunet, 2023/03/09
- [taler-wallet-core] 05/06: fix: summary empty string also means that summary is required, gnunet, 2023/03/09