diff options
| -rw-r--r-- | src/server/DashUploadUtils.ts | 5 | ||||
| -rw-r--r-- | src/server/server_Initialization.ts | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts index 886515286..2bf4c1956 100644 --- a/src/server/DashUploadUtils.ts +++ b/src/server/DashUploadUtils.ts @@ -17,6 +17,7 @@ import { red } from 'colors'; import { Stream } from 'stream'; import { resolvedPorts } from './server_Initialization'; const requestImageSize = require("../client/util/request-image-size"); +import { resolvedServerUrl } from "./server_Initialization"; export enum SizeSuffix { Small = "_s", @@ -185,7 +186,7 @@ export namespace DashUploadUtils { if (error !== null) { return error; } - source = `http://localhost:${resolvedPorts.server}${clientPathToFile(Directory.images, resolved)}`; + source = `${resolvedServerUrl}${clientPathToFile(Directory.images, resolved)}`; } let resolvedUrl: string; /** @@ -202,7 +203,7 @@ export namespace DashUploadUtils { if (matches === null) { resolvedUrl = source; } else { - resolvedUrl = `http://localhost:${resolvedPorts.server}/${matches[1].split("\\").join("/")}`; + resolvedUrl = `${resolvedServerUrl}/${matches[1].split("\\").join("/")}`; } // See header comments: not all image files have exif data (I believe only JPG is the only format that can have it) const exifData = await parseExifData(resolvedUrl); diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts index b5b114933..744d4547b 100644 --- a/src/server/server_Initialization.ts +++ b/src/server/server_Initialization.ts @@ -33,6 +33,7 @@ export type RouteSetter = (server: RouteManager) => void; export let disconnect: Function; export let resolvedPorts: { server: number, socket: number } = { server: 1050, socket: 4321 }; +export let resolvedServerUrl: string; export default async function InitializeServer(routeSetter: RouteSetter) { const app = buildWithMiddleware(express()); @@ -57,7 +58,7 @@ export default async function InitializeServer(routeSetter: RouteSetter) { registerRelativePath(app); let server: HttpServer | HttpsServer; - const { serverPort } = process.env; + const { serverPort, serverName } = process.env; isRelease && serverPort && (resolvedPorts.server = Number(serverPort)); await new Promise<void>(resolve => server = isRelease ? createServer(SSL.Credentials, app).listen(resolvedPorts.server, resolve) : @@ -65,6 +66,8 @@ export default async function InitializeServer(routeSetter: RouteSetter) { ); logPort("server", resolvedPorts.server); + resolvedServerUrl = `${isRelease && serverName ? `https://${serverName}.com` : "http://localhost"}:${resolvedPorts.server}`; + // initialize the web socket (bidirectional communication: if a user changes // a field on one client, that change must be broadcast to all other clients) await WebSocket.initialize(isRelease, app); |