Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions EndpointController.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import {
HostEndPointOptions,
HostManagerOptions,
HostServiceOptions,
ServiceSelectorPredicateItemOptions
ServiceSelectorPredicateItemOptions,
} from "./models/model.js";
import DefaultManagerConfig from "./Models/DefaultConfig.js";
import DefaultManagerConfig from "./models/DefaultConfig.js";
import RouterHostService from "./services/routerHostService.js";

class EndPointController {
Expand Down
2 changes: 1 addition & 1 deletion Models/Connection/ConnectionUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import EdgeConnectionInfo from "./EdgeConnectionInfo.js";
import InlineConnectionInfo from "./InlineConnectionInfo.js";
import SqlConnectionInfo from "./SqlConnectionInfo.js";
import MongoConnectionInfo from "./MongoConnectionInfo.js";
import SqliteConnectionInfo from "./SqLiteConnectionInfo.js";
import SqliteConnectionInfo from "./SqliteConnectionInfo.js";
import MySqlConnectionInfo from "./MySqlConnectionInfo.js";
import SocketConnectionInfo from "./SocketConnectionInfo.js";
export default class ConnectionUtil {
Expand Down
4 changes: 2 additions & 2 deletions Models/Connection/MySqlConnectionInfo.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import mySql from "mysql2";
import ConnectionInfo from "./ConnectionInfo.js";
import MySqlSettingData from "./MySqlSettingData.js";
import MySqlSettingData from "./mySqlSettingData.js";
import DataSourceCollection from "../../renderEngine/Source/DataSourceCollection.js";
import CancellationToken from "../../renderEngine/Cancellation/CancellationToken.js";
import Request from "../request.js";
import WebServerException from "../Exceptions/WebServerException.js";
import MysqlRow from "../mysqlRow.js";
import MysqlRow from "../mySqlRow.js";
import SqlSettingData from "./SqlSettingData.js";
export default class MySqlConnectionInfo extends ConnectionInfo {
/** @type {mySql.Pool<SqlSettingData>} */
Expand Down
2 changes: 1 addition & 1 deletion Models/FileResponse.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import mime from "mime-types";
import fs from "fs";
import { StatusCodes } from "http-status-codes";
import Response from "./response.js";
import Response from "./Response.js";

export default class FileResponse extends Response {
/** @type {string}*/
Expand Down
6 changes: 3 additions & 3 deletions Models/Index1Response.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import CancellationToken from "../renderEngine/Cancellation/CancellationToken.js
import RequestContext from "../renderEngine/Context/RequestContext.js";
import IRoutingRequest from "./IRoutingRequest.js";
import ServiceSettings from "./ServiceSettings.js";
import RequestBaseResponse from "./requestBaseResponse.js";
import RequestBaseResponse from "./RequestBaseResponse.js";
import RequestDebugContext from "./../renderEngine/Context/RequestDebugContext.js";
import RequestDebugMaxContext from "../renderEngine/Context/requestDebugMaxContext.js";
import RequestDebugMaxContext from "../renderEngine/Context/RequestDebugMaxContext.js";
import DebugContext from "../renderEngine/Context/DebugContext.js";
import VoidContext from "../renderEngine/Context/VoidContext.js";
import StringResult from "../renderEngine/Models/StringResult.js";
Expand Down Expand Up @@ -62,7 +62,7 @@ export default class Index1Response extends RequestBaseResponse {
const getIlStep = requestDebugContext.newStep("Get IL");
let commandIl;
let command;
let context
let context;
try {
if (!this._request.cms.page_il) {
//Update IL step
Expand Down
6 changes: 3 additions & 3 deletions Models/Index2Response.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import fs from "fs";
import { StatusCodes } from "http-status-codes";
import RequestBaseResponse from "./requestBaseResponse.js";
import RequestBaseResponse from "./RequestBaseResponse.js";
import IRoutingRequest from "./IRoutingRequest.js";

export default class Index2Response extends RequestBaseResponse {
/**
* @param {IRoutingRequest} request
*/
constructor(request,setting) {
super(request,setting);
constructor(request, setting) {
super(request, setting);
}
/**
* @returns {Promise<[number,NodeJS.Dict<number | string | string[]>,*]>}
Expand Down
55 changes: 27 additions & 28 deletions Models/Index4Response.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import fs from "fs";
import { StatusCodes } from "http-status-codes";
import RequestBaseResponse from "./requestBaseResponse.js";
import im from "imagemagick";
import RequestBaseResponse from "./RequestBaseResponse.js";
import path from "path";
import Pako from "pako";
import Util from "../Util.js";
Expand Down Expand Up @@ -109,47 +108,47 @@ export default class Index4Response extends RequestBaseResponse {
*/
static _resizeImageAsync(content, size, deform) {
return new Promise((resolve, reject) => {
const splitedSize = size.split("X");
const splitedSize = size.split("X");
const width = Number(splitedSize[0]);
const height = Number(splitedSize[1]);

const resizeOptions = {
width: width,
height: height,
fit: deform ? sharp.fit.fill : sharp.fit.inside,
withoutEnlargement: true,
fit: deform ? sharp.fit.fill : sharp.fit.inside,
withoutEnlargement: true,
};

sharp(content)
.resize(resizeOptions)
.toBuffer()
.then(resizedBuffer => {
.then((resizedBuffer) => {
resolve(resizedBuffer);
})
.catch(err => {
.catch((err) => {
reject(new WebServerException("Error in resizing image", err));
});
});
}
/**
* @param {Buffer} content
* @param {number} quality
* @returns {Promise<Buffer>}
*/
static _mackWebpAsync(content, quality) {
return new Promise((resolve, reject) => {
// Configure sharp for converting to WebP
sharp(content)
.webp({ quality: quality, lossless: true }) // Set quality and lossless option
.toBuffer()
.then(webpBuffer => {
resolve(webpBuffer);
})
.catch(err => {
reject(new WebServerException("Error in creating WebP image", err));
});
});
}
/**
* @param {Buffer} content
* @param {number} quality
* @returns {Promise<Buffer>}
*/
static _mackWebpAsync(content, quality) {
return new Promise((resolve, reject) => {
// Configure sharp for converting to WebP
sharp(content)
.webp({ quality: quality, lossless: true }) // Set quality and lossless option
.toBuffer()
.then((webpBuffer) => {
resolve(webpBuffer);
})
.catch((err) => {
reject(new WebServerException("Error in creating WebP image", err));
});
});
}

/**
* @param {string} filePath
Expand Down
6 changes: 3 additions & 3 deletions Models/Index5Response.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import IRoutingRequest from "./IRoutingRequest.js";
import RequestBaseResponse from "./requestBaseResponse.js";
import RequestBaseResponse from "./RequestBaseResponse.js";

export default class Index5Response extends RequestBaseResponse {
/**
* @param {IRoutingRequest} request
*/
constructor(request,setting) {
super(request,setting);
constructor(request, setting) {
super(request, setting);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions Models/RequestBaseResponse.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import IRoutingRequest from "./IRoutingRequest.js";
import Response from "./response.js";
import Response from "./Response.js";

export default class RequestBaseResponse extends Response {
/**@type {IRoutingRequest} request */
Expand All @@ -14,6 +14,6 @@ export default class RequestBaseResponse extends Response {
constructor(request, settings) {
super();
this._request = request;
this._settings = settings
this._settings = settings;
}
}
4 changes: 2 additions & 2 deletions Models/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import HostManagerOptions from "./options/hostManagerOptions.js";
import HostEndPointOptions from "./options/hostEndPointOptions.js";
import HostServiceOptions from "./options/hostServiceOptions.js";
import SslCertificateOptions from "./options/sslCertificateOptions.js";
import SniCertificateOptions from "./options/SniCertificateOptions.js";
import SniCertificateOptions from "./options/sniCertificateOptions.js";
import ServiceSelectorPredicateItemOptions from "./options/serviceSelectorPredicateItemOptions.js";
import ServiceSelectorPredicateOptions from "./options/ServiceSelectorPredicateOptions.js";
import ServiceSelectorPredicateOptions from "./options/serviceSelectorPredicateOptions.js";

export {
HostManagerOptions,
Expand Down
2 changes: 1 addition & 1 deletion Models/options/hostEndPointOptions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PortListenerOptions from "./portListenerOptions.js";
import ServiceSelectorPredicateOptions from "./ServiceSelectorPredicateOptions.js";
import ServiceSelectorPredicateOptions from "./serviceSelectorPredicateOptions.js";
import CacheSettings from "./CacheSettings.js";
export default class HostEndPointOptions {
/**@type {"http" | "webSocket"} */
Expand Down
4 changes: 2 additions & 2 deletions Models/options/portListenerOptions.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import SslCertificateOptions from "./sslCertificateOptions.js";
import SniCertificateOptions from "./SniCertificateOptions.js";
import SniCertificateOptions from "./sniCertificateOptions.js";
export default class PortListenerOptions {
/** @type {string} */
id
id;
/**@type {string} */
EndPoint;
/**@type {SslCertificateOptions|SniCertificateOptions} */
Expand Down
6 changes: 3 additions & 3 deletions Services/HttpHostService.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import HostService from "./hostService.js";
import WebServerException from "../models/Exceptions/WebServerException.js";
import Request from "../models/request.js";
import Response from "../models/response.js";
import Response from "../models/Response.js";
export class HttpHostService extends HostService {
/**
* @param {string} name
Expand Down Expand Up @@ -29,8 +29,8 @@ export class HttpHostService extends HostService {
null
);
data.isSecure = request.isSecure;
return {result:this._createResponse(data),responseCms : data}

return { result: this._createResponse(data), responseCms: data };
} catch (er) {
console.error(er);
throw er;
Expand Down
2 changes: 1 addition & 1 deletion Services/WebsocketService.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import HostService from "./hostService.js";
import WebServerException from "../models/Exceptions/WebServerException.js";
import { HostServiceOptions } from "../models/model.js";
import WSMessageType from "../Models/WSMessageType.js";
import WSMessageType from "../models/WSMessageType.js";
import WebSocket from "ws";
import SessionManager from "./sessionManager.js";

Expand Down
10 changes: 5 additions & 5 deletions Services/hostService.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Index2Response from "../models/index2Response.js";
import Index5Response from "../models/index5Response.js";
import Index1Response from "../Models/Index1Response.js";
import Index2Response from "../models/Index2Response.js";
import Index5Response from "../models/Index5Response.js";
import Index1Response from "../models/Index1Response.js";
import Request from "../models/request.js";
import Response from "../models/response.js";
import Response from "../models/Response.js";
import BinaryContent from "../fileStreamer/Models/BinaryContent.js";
import StreamerEngine from "../fileStreamer/StreamerEngine.js";
import { HostServiceOptions } from "../models/model.js";
Expand Down Expand Up @@ -70,7 +70,7 @@ export default class HostService {
async initializeAsync() {
this._commands = {
...CommandUtil.addDefaultCommands(),
...await LoadCommand.process(this._options.Settings.LibPath),
...(await LoadCommand.process(this._options.Settings.LibPath)),
};
}

Expand Down
2 changes: 1 addition & 1 deletion Services/hostServices.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import HostService from "./hostService.js";
import StaticFileProxyHostService from "./staticFileHostService.js";
import RouterHostService from "./routerHostService.js";
import RouterOptions from "./RouterOptions.js";
import RouterOptions from "./routerOptions.js";
import HostEndPoint from "../endPoint/hostEndPoint.js";

export {
Expand Down
6 changes: 3 additions & 3 deletions Services/routerHostService.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import HostService from "./hostService.js";
import Request from "../models/request.js";
import Response from "../models/response.js";
import RouterOptions from "./RouterOptions.js";
import Response from "../models/Response.js";
import RouterOptions from "./routerOptions.js";
import { ServiceSelectorPredicateOptions } from "../models/model.js";

export default class RouterHostService extends HostService {
Expand All @@ -13,7 +13,7 @@ export default class RouterHostService extends HostService {
* @param {HostService[]} services
*/
constructor(name, options, services) {
super(name,options);
super(name, options);
this.#routes = [];
options.Items.forEach((option) => {
const service = services.find((x) => x.name == option.Service);
Expand Down
2 changes: 1 addition & 1 deletion Services/routerOptions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import HostService from "./HostService.js";
import HostService from "./hostService.js";
import { ServiceSelectorPredicateItemOptions } from "../models/model.js";

export default class RouterOptions {
Expand Down
2 changes: 1 addition & 1 deletion Services/staticFileHostService.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from "path";
import HostService from "./hostService.js";
import Request from "../models/request.js";
import Response from "../models/response.js";
import Response from "../models/Response.js";
import FileResponse from "../models/fileResponse.js";
import { HostServiceOptions } from "../models/model.js";

Expand Down
6 changes: 2 additions & 4 deletions Services/testChatService.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import HostService from "./hostService.js";
import WebServerException from "../models/Exceptions/WebServerException.js";
import { HostServiceOptions } from "../models/model.js";
import WSMessageType from "../Models/WSMessageType.js";
import WSMessageType from "../models/WSMessageType.js";
import WebSocket from "ws";
import SessionManager from "./sessionManager.js";

Expand All @@ -20,8 +19,7 @@ export default class TestChatService extends HostService {
this.isInitialized = false;
this.sessionManager = new SessionManager();
}
init(sessionId, serverSocket) {
}
init(sessionId, serverSocket) {}
/** @param {WebSocket} socket */
createSession(socket) {
let sessionId = this.sessionManager.addSession(socket);
Expand Down
22 changes: 9 additions & 13 deletions endPoint/WebsocketEndpoint.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import http from "http";
import https from "https";
import { WebSocketServer } from "ws";
import { WebSocketServer } from "ws";
import HostEndPoint from "./hostEndPoint.js";
import WebsocketService from "../Services/WebsocketService.js";
import WebsocketService from "../services/WebsocketService.js";
import WebServerException from "../models/Exceptions/WebServerException.js";
import TestChatService from "../Services/testChatService.js";
import TestChatService from "../services/testChatService.js";

export default class WebsocketEndPoint extends HostEndPoint {
/** @type {import("tls").SecureContextOptions} */
Expand All @@ -30,18 +28,16 @@ export default class WebsocketEndPoint extends HostEndPoint {
}

_createServer() {

const wss = new WebSocketServer({ ip: this._ip, port :this._port });

wss.on("connection", (clientSocket) => {

const wss = new WebSocketServer({ ip: this._ip, port: this._port });

wss.on("connection", (clientSocket) => {
const sessionId = this._service.createSession(clientSocket);
this._service.init(sessionId,clientSocket);
this._service.init(sessionId, clientSocket);
clientSocket.on("message", (message) => {
this._service.sendMessage(sessionId,message.toString())
this._service.sendMessage(sessionId, message.toString());
});
clientSocket.on("close", () => {
this._service.disconnect(sessionId)
this._service.disconnect(sessionId);
});
clientSocket.on("error", (err) => {
console.error("Client socket error:", err);
Expand Down
4 changes: 2 additions & 2 deletions endPoint/httpHostEndPoint.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import BasisCoreException from "../models/Exceptions/BasisCoreException.js";
import BinaryContent from "../fileStreamer/Models/BinaryContent.js";
import StringResult from "../renderEngine/Models/StringResult.js";
import HostService from "../services/hostService.js";
import RabbitMQCacheManager from "./../Models/CacheCommands/RabbitMQCacheManager.js";
import BasecacheManager from "../Models/CacheCommands/BasecacheManager.js";
import RabbitMQCacheManager from "./../models/CacheCommands/RabbitMQCacheManager.js";
import BasecacheManager from "../models/CacheCommands/BaseCacheManager.js";
import CacheConnectionBase from "../models/CacheCommands/CacheConnection/CacheConnectionBase.js";
import { HostEndPointOptions } from "../models/model.js";
import SqliteCacheConnection from "../models/CacheCommands/CacheConnection/SqliteCacheConnection.js";
Expand Down
Loading