initial support for https clients

This commit is contained in:
ph4z committed 2021-10-20 11:07:52 +00:00
1 parent a8d2a8f837
commit 8e61bccbba
6 files changed
+23 -14

No files matched your search

+2 -2
View File
@@ -45,7 +45,7 @@ function newDailyFiles() {
}
}
function initialize(pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, pDatetime, pTimeFrame, pHost, pPort, pEventsServerClient, callBackFunction) {
function initialize(pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, pDatetime, pTimeFrame, pHost, pPort, pEventsServerClient, callBackFunction, scheme='http') {
try {
callBackWhenFileReceived = callBackFunction
@@ -55,7 +55,7 @@ function newDailyFiles() {
let timeFrames
fileCloud = newFileCloud()
fileCloud.initialize(pBot, pHost, pPort)
fileCloud.initialize(pBot, pHost, pPort, scheme)
/* Config Validations */
if (pDataset.config.validTimeFrames === undefined) {
+2 -2
View File
@@ -17,8 +17,8 @@ function newFileCloud () {
let fileStorage
return thisObject
function initialize (pBot, pHost, pPort) {
fileStorage = newFileStorage(pHost, pPort)
function initialize (pBot, pHost, pPort, scheme='http') {
fileStorage = newFileStorage(pHost, pPort, scheme)
}
function getFile (pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, ptimeFrameLabel, pDatetime, pSequence, pDataRange, pTimeFrames, callBackFunction) {
+2 -2
View File
@@ -1,4 +1,4 @@
function newFileStorage(host, port) {
function newFileStorage(host, port, scheme='http') {
const MODULE_NAME = 'File Storage'
const INFO_LOG = false
const logger = newWebDebugLog()
@@ -40,7 +40,7 @@ function newFileStorage(host, port) {
let url
if (host !== undefined && port !== undefined) {
url = 'http://' + host + ':' + port + '/' + folder + filePath
url = scheme + '://' + host + ':' + port + '/' + folder + filePath
} else {
url = folder + filePath
}
+3 -2
View File
@@ -80,7 +80,8 @@ function newMarketFiles() {
pHost,
pPort,
pEventsServerClient,
callBackFunction) {
callBackFunction,
scheme='http') {
try {
let timeFrames
@@ -94,7 +95,7 @@ function newMarketFiles() {
eventsServerClient = pEventsServerClient
fileCloud = newFileCloud()
fileCloud.initialize(pBot, pHost, pPort)
fileCloud.initialize(pBot, pHost, pPort, scheme)
/* Some Validations */
if (dataset.config.validTimeFrames === undefined) {
+5 -5
View File
@@ -74,7 +74,7 @@ function newProductStorage(name) {
}
}
function initialize(mine, bot, session, product, exchange, market, pDatetime, pTimeFrame, host, port, eventsServerClient, callBackFunction) {
function initialize(mine, bot, session, product, exchange, market, pDatetime, pTimeFrame, host, port, eventsServerClient, callBackFunction, scheme='http') {
try {
datetime = pDatetime
timeFrame = pTimeFrame
@@ -90,7 +90,7 @@ function newProductStorage(name) {
dataSetsToLoad++
let marketFiles = newMarketFiles()
marketFiles.initialize(mine, bot, session, product, dataset, exchange, market, host, port, eventsServerClient, onMarketFileReady)
marketFiles.initialize(mine, bot, session, product, dataset, exchange, market, host, port, eventsServerClient, onMarketFileReady, scheme)
thisObject.marketFiles.push(marketFiles)
}
break
@@ -99,7 +99,7 @@ function newProductStorage(name) {
dataSetsToLoad++
let dailyFiles = newDailyFiles()
dailyFiles.initialize(mine, bot, session, product, dataset, exchange, market, pDatetime, pTimeFrame, host, port, eventsServerClient, onDailyFileReady)
dailyFiles.initialize(mine, bot, session, product, dataset, exchange, market, pDatetime, pTimeFrame, host, port, eventsServerClient, onDailyFileReady, scheme)
thisObject.dailyFiles.push(dailyFiles)
}
break
@@ -108,7 +108,7 @@ function newProductStorage(name) {
dataSetsToLoad++
let singleFile = newSingleFile()
singleFile.initialize(mine, bot, session, product, dataset, exchange, market, host, port, eventsServerClient, onSingleFileReady)
singleFile.initialize(mine, bot, session, product, dataset, exchange, market, host, port, eventsServerClient, onSingleFileReady, scheme)
thisObject.singleFile.push(singleFile)
}
break
@@ -117,7 +117,7 @@ function newProductStorage(name) {
dataSetsToLoad++
let fileSequences = newFileSequence()
fileSequences.initialize(mine, bot, session, product, dataset, exchange, market, host, port, eventsServerClient, onFileSequenceReady)
fileSequences.initialize(mine, bot, session, product, dataset, exchange, market, host, port, eventsServerClient, onFileSequenceReady, scheme)
thisObject.fileSequences.push(fileSequences)
}
break
@@ -173,8 +173,15 @@ function newPlottersManager() {
let host = layer.lanNetworkNode.config.host
let webPort = layer.lanNetworkNode.config.webPort
let extWSURL = layer.lanNetworkNode.config.webSocketsExternalURL
let scheme = 'http'
if (host === undefined) { host = window.location.hostname }
if (webPort === undefined) { webPort = window.location.port }
if (extWSURL !== undefined) {
host = window.location.hostname
webPort = window.location.port
scheme = window.location.protocol.slice(0,-1)
}
let eventsServerClient = UI.projects.foundations.spaces.designSpace.workspace.eventsServerClients.get(layer.lanNetworkNode.id)
@@ -190,7 +197,8 @@ function newPlottersManager() {
host,
webPort,
eventsServerClient,
onProductStorageInitialized
onProductStorageInitialized,
scheme,
)
function onProductStorageInitialized(err) {