Skip to content

Commit de6eb8f

Browse files
skadefroskadefro
committed
improve code q
1 parent 7e17054 commit de6eb8f

3 files changed

Lines changed: 11 additions & 46 deletions

File tree

‎OpenFlow/src/DatabaseConnection.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -989,9 +989,7 @@ export class DatabaseConnection {
989989
let date = new Date()
990990
date.setMonth(date.getMonth() - 1);
991991
let tempresult: any[] = [];
992-
for (let i = 0; i < items.length; i++) {
993-
let item = items[i];
994-
992+
for (let item of items) {
995993
item = this.ensureResource(item);
996994
DatabaseConnection.traversejsonencode(item);
997995
let name = item.name;
@@ -1096,8 +1094,7 @@ export class DatabaseConnection {
10961094
Logger.otel.endSpan(mongodbspan);
10971095
Logger.otel.endTimer(ot_end, DatabaseConnection.mongodb_insert, { collection: collectionname });
10981096

1099-
for (let y = 0; y < items.length; y++) {
1100-
let item = items[y];
1097+
for (let item of items) {
11011098
if (collectionname === "users" && item._type === "user") {
11021099
Base.addRight(item, item._id, item.name, [Rights.read, Rights.update, Rights.invoke]);
11031100
span.addEvent("FindRoleByNameOrId");

‎OpenFlow/src/LoginProvider.ts‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -557,15 +557,6 @@ export class LoginProvider {
557557
} finally {
558558
Logger.otel.endSpan(span);
559559
}
560-
// try {
561-
// LoginProvider.RegisterProviders(app, baseurl);
562-
// } catch (error) {
563-
// span.recordException(error);
564-
// return res.status(500).send({ message: error.message ? error.message : error });
565-
// } finally {
566-
// Logger.otel.endSpan(span);
567-
// }
568-
569560
});
570561
app.get("/download/:id", async (req, res) => {
571562
const span: Span = Logger.otel.startSpan("LoginProvider.download");
@@ -674,10 +665,6 @@ export class LoginProvider {
674665
fileSize: (1000000 * 25) // 25MB
675666
}
676667
}).any();
677-
678-
// app.get("/upload", async (req: any, res: any, next: any): Promise<void> => {
679-
// const query = req.query;
680-
// });
681668
app.delete("/upload", async (req: any, res: any, next: any): Promise<void> => {
682669
const span: Span = Logger.otel.startSpan("LoginProvider.upload");
683670
try {
@@ -727,7 +714,6 @@ export class LoginProvider {
727714
}
728715

729716
});
730-
// app.get("/upload/:fileId", async (req: any, res: any, next: any): Promise<void> => {
731717
app.get("/upload", async (req: any, res: any, next: any): Promise<void> => {
732718
const span: Span = Logger.otel.startSpan("LoginProvider.upload");
733719
try {

‎OpenFlow/src/Messages/Message.ts‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { Readable, Stream } from "stream";
1313
import { GridFSBucket, ObjectID, Cursor } from "mongodb";
1414
import * as path from "path";
1515
import { DatabaseConnection } from "../DatabaseConnection";
16-
import { StripeMessage, EnsureStripeCustomerMessage, NoderedUtil, QueuedMessage, RegisterQueueMessage, QueueMessage, CloseQueueMessage, ListCollectionsMessage, DropCollectionMessage, QueryMessage, AggregateMessage, InsertOneMessage, UpdateOneMessage, Base, UpdateManyMessage, InsertOrUpdateOneMessage, DeleteOneMessage, MapReduceMessage, SigninMessage, TokenUser, User, Rights, EnsureNoderedInstanceMessage, DeleteNoderedInstanceMessage, DeleteNoderedPodMessage, RestartNoderedInstanceMessage, GetNoderedInstanceMessage, GetNoderedInstanceLogMessage, SaveFileMessage, WellknownIds, GetFileMessage, UpdateFileMessage, CreateWorkflowInstanceMessage, RegisterUserMessage, NoderedUser, WatchMessage, GetDocumentVersionMessage, DeleteManyMessage, InsertManyMessage, GetKubeNodeLabels, PushMetricsMessage, RegisterExchangeMessage } from "@openiap/openflow-api";
16+
import { StripeMessage, EnsureStripeCustomerMessage, NoderedUtil, QueuedMessage, RegisterQueueMessage, QueueMessage, CloseQueueMessage, ListCollectionsMessage, DropCollectionMessage, QueryMessage, AggregateMessage, InsertOneMessage, UpdateOneMessage, Base, UpdateManyMessage, InsertOrUpdateOneMessage, DeleteOneMessage, MapReduceMessage, SigninMessage, TokenUser, User, Rights, EnsureNoderedInstanceMessage, DeleteNoderedInstanceMessage, DeleteNoderedPodMessage, RestartNoderedInstanceMessage, GetNoderedInstanceMessage, GetNoderedInstanceLogMessage, SaveFileMessage, WellknownIds, GetFileMessage, UpdateFileMessage, CreateWorkflowInstanceMessage, RegisterUserMessage, NoderedUser, WatchMessage, GetDocumentVersionMessage, DeleteManyMessage, InsertManyMessage, GetKubeNodeLabels, RegisterExchangeMessage } from "@openiap/openflow-api";
1717
import { Billing, stripe_customer, stripe_base, stripe_list, StripeAddPlanMessage, StripeCancelPlanMessage, stripe_subscription, stripe_subscription_item, stripe_plan, stripe_coupon } from "@openiap/openflow-api";
1818
import { V1ResourceRequirements, V1Deployment } from "@kubernetes/client-node";
1919
import { amqpwrapper } from "../amqpwrapper";
@@ -578,8 +578,6 @@ export class Message {
578578

579579
if (msg.queuename.length == 24 && Config.amqp_force_sender_has_read) {
580580
const tuser = Crypt.verityToken(msg.jwt);
581-
let name = tuser.username.split("@").join("").split(".").join("");
582-
name = name.toLowerCase();
583581
let allowed: boolean = false;
584582
if (tuser._id == msg.queuename) {
585583
// Queue is for me
@@ -594,12 +592,12 @@ export class Message {
594592
const arr = await Config.db.query({ _id: msg.queuename }, { name: 1 }, 1, 0, null, "users", msg.jwt, undefined, undefined, span);
595593
if (arr.length > 0) allowed = true;
596594
if (!allowed) {
597-
const arr = await Config.db.query({ _id: msg.queuename }, { name: 1 }, 1, 0, null, "openrpa", msg.jwt, undefined, undefined, span);
598-
if (arr.length > 0) allowed = true;
595+
const arr1 = await Config.db.query({ _id: msg.queuename }, { name: 1 }, 1, 0, null, "openrpa", msg.jwt, undefined, undefined, span);
596+
if (arr1.length > 0) allowed = true;
599597
}
600598
if (!allowed) {
601-
const arr = await Config.db.query({ _id: msg.queuename }, { name: 1 }, 1, 0, null, "workflow", msg.jwt, undefined, undefined, span);
602-
if (arr.length > 0) allowed = true;
599+
const arr2 = await Config.db.query({ _id: msg.queuename }, { name: 1 }, 1, 0, null, "workflow", msg.jwt, undefined, undefined, span);
600+
if (arr2.length > 0) allowed = true;
603601
}
604602
}
605603
if (!allowed) {
@@ -1012,12 +1010,6 @@ export class Message {
10121010
if (NoderedUtil.IsNullEmpty(msg.w as any)) { msg.w = 0; }
10131011
if (NoderedUtil.IsNullEmpty(msg.j as any)) { msg.j = false; }
10141012
if (msg.collectionname == "openrpa_instances" && msg.item._type == "workflowinstance") {
1015-
// Force uniqeness for workflow instances in old versions of openrpa
1016-
const versionPadded = version => version.split('.').map((n, i) => n.padStart(3, '0')).join('');
1017-
// var version: string = versionPadded(cli.clientversion);
1018-
// if (cli.clientagent == "openrpa" && parseInt(version) <= parseInt("001002040000")) { // 001002040000
1019-
// msg.uniqeness = "InstanceId,WorkflowId";
1020-
// }
10211013
let state: string = (msg.item as any).state;
10221014
// Force removing completed states, for old versions of openrpa
10231015
if (msg.item && ["aborted", "failed", "completed"].indexOf(state) > -1) {
@@ -1405,10 +1397,6 @@ export class Message {
14051397
msg.user = TokenUser.From(user);
14061398

14071399
const jwt: string = Crypt.createToken(msg.user, Config.shorttoken_expires_in);
1408-
let name = user.username;
1409-
name = name.split("@").join("").split(".").join("");
1410-
name = name.toLowerCase();
1411-
14121400
DBHelper.EnsureNoderedRoles(user, jwt, false, span);
14131401
} catch (error) {
14141402
span.recordException(error);
@@ -1452,7 +1440,7 @@ export class Message {
14521440
if (NoderedUtil.IsNullEmpty(process.env["KUBERNETES_SERVICE_HOST"])) {
14531441
try {
14541442
const docker = new Docker();
1455-
var list = await docker.listContainers();
1443+
await docker.listContainers();
14561444
Message.usedocker = true;
14571445
} catch (error) {
14581446
console.log(error);
@@ -1473,17 +1461,16 @@ export class Message {
14731461
}
14741462
}
14751463
_pullImage(docker: Dockerode, imagename: string) {
1476-
const self = this;
14771464
return new Promise<void>((resolve, reject) => {
14781465
docker.pull(imagename, function (err, stream) {
14791466
if (err)
14801467
return reject(err);
14811468

14821469
docker.modem.followProgress(stream, onFinished, onProgress);
14831470

1484-
function onFinished(err, output) {
1471+
function onFinished(err2, output) {
14851472
console.log(output);
1486-
if (err) return reject(err);
1473+
if (err2) return reject(err2);
14871474

14881475
return resolve();
14891476
}
@@ -1518,8 +1505,7 @@ export class Message {
15181505
let me = null;
15191506
let list = await docker.listContainers({ all: 1 });
15201507
let instance: any = null;
1521-
for (let i = 0; i < list.length; i++) {
1522-
const item = list[i];
1508+
for (let item of list) {
15231509
var Created = new Date(item.Created * 1000);
15241510
(item as any).metadata = { creationTimestamp: Created, name: item.Labels["com.docker.compose.service"] };
15251511
(item as any).status = { phase: item.State }
@@ -1575,10 +1561,6 @@ export class Message {
15751561
if (me.Labels["com.docker.compose.version"]) Labels["com.docker.compose.version"] = me.Labels["com.docker.compose.version"];
15761562
if (me.NetworkSettings && me.NetworkSettings.Networks) {
15771563
const keys = Object.keys(me.NetworkSettings.Networks);
1578-
// NetworkingConfig = {};
1579-
// for (let i = 0; i < keys.length; i++) {
1580-
// NetworkingConfig[keys[i]] = {};
1581-
// }
15821564
HostConfig.NetworkMode = keys[0];
15831565
}
15841566
}

0 commit comments

Comments
 (0)