@lilaquadrat/studio 2.4.33 → 2.4.34

package/lib/src/models/hostingCommand.model.d.ts

@@ -4,7 +4,7 @@ export interface HostingCommand extends BasicDataInterface {
     target: 'nginx' | 'docker';
     command: Command<HostingCommand['target']>;
     date: Date;
-    state: 'new' | 'success' | 'error';
+    state: 'new' | 'inProgress' | 'success' | 'error';
     data: {
         [key: string]: any;
     };

package/lib/src/models/hostingCommand.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hostingCommand.model.d.ts","sourceRoot":"","sources":["../../../src/models/hostingCommand.model.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAC/C,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AAEnE,MAAM,WAAW,cAAe,SAAQ,kBAAkB;IACxD,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IACnC,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE;QACN,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC;QAC3B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;KAC5C,CAAC;CACH;AAED,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,GACtC,SAAS,GAAG,OAAO,GAAG,MAAM,GAC5B,CAAC,SAAS,QAAQ,GAChB,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,GAC5E,KAAK,CAAC;AAEZ,QAAA,MAAM,KAAK,yBAAmE,CAAC;AAiB/E,eAAe,KAAK,CAAC"}
+{"version":3,"file":"hostingCommand.model.d.ts","sourceRoot":"","sources":["../../../src/models/hostingCommand.model.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAC/C,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AAEnE,MAAM,WAAW,cAAe,SAAQ,kBAAkB;IACxD,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,KAAK,GAAG,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC;IAClD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE;QACN,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAC;QAC3B,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;KAC5C,CAAC;CACH;AAED,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,GACtC,SAAS,GAAG,OAAO,GAAG,MAAM,GAC5B,CAAC,SAAS,QAAQ,GAChB,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,GAC5E,KAAK,CAAC;AAEZ,QAAA,MAAM,KAAK,yBAAmE,CAAC;AA2B/E,eAAe,KAAK,CAAC"}

package/lib/src/models/hostingCommand.model.js

@@ -18,5 +18,13 @@ model.setSchema({
     },
     additionalProperties: false,
 }, 'create');
+model.setSchema({
+    type: 'object',
+    properties: {
+        state: { type: 'string' },
+        data: { type: 'object' },
+    },
+    additionalProperties: false,
+}, 'change');
 exports.default = model;
 //# sourceMappingURL=hostingCommand.model.js.map

package/lib/src/models/hostingCommand.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"hostingCommand.model.js","sourceRoot":"","sources":["../../../src/models/hostingCommand.model.ts"],"names":[],"mappings":";;;;;AAAA,6EAA+C;AAwB/C,MAAM,KAAK,GAAG,IAAI,uBAAO,CAAiB,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;AAE/E,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB;IACD,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CAAC,CAAC;AAEV,kBAAe,KAAK,CAAC"}
+{"version":3,"file":"hostingCommand.model.js","sourceRoot":"","sources":["../../../src/models/hostingCommand.model.ts"],"names":[],"mappings":";;;;;AAAA,6EAA+C;AAwB/C,MAAM,KAAK,GAAG,IAAI,uBAAO,CAAiB,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;AAE/E,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB;IACD,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CAAC,CAAC;AAEV,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB;IACD,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CAAC,CAAC;AAEV,kBAAe,KAAK,CAAC"}

package/lib/src/services/hostingCommands.service.d.ts

@@ -1,9 +1,16 @@
+import { ObjectId } from 'mongodb';
 import Immutable from '../Immutable.class';
 import { HostingCommand, Command } from '../models/hostingCommand.model';
 declare class HostingCommandsService extends Immutable<HostingCommand> {
     model: import("../classes/modelv2.class").default<HostingCommand>;
-    nginx(command: Command<'nginx'>, user: string, app: string): Promise<import("../interfaces/CreateResult.interface").default<HostingCommand>>;
-    docker(command: Command<'docker'>, company: string | undefined, project: string | undefined, user: string, app: string): Promise<import("../interfaces/CreateResult.interface").default<HostingCommand>>;
+    nginx(command: Command<'nginx'>, user: string, app: string): Promise<void | import("../interfaces/CreateResult.interface").default<HostingCommand>>;
+    docker(command: Command<'docker'>, company: string | undefined, project: string | undefined, user: string, app: string): Promise<void | import("../interfaces/CreateResult.interface").default<HostingCommand>>;
+    checkIfExists(command: HostingCommand): Promise<boolean>;
+    list(after?: ObjectId, state?: HostingCommand['state']): Promise<import("mongodb").WithId<HostingCommand>[]>;
+    listNew(limit?: number): Promise<{
+        data: import("mongodb").WithId<HostingCommand>[];
+        more: boolean;
+    }>;
 }
 declare const _default: HostingCommandsService;
 export default _default;

package/lib/src/services/hostingCommands.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hostingCommands.service.d.ts","sourceRoot":"","sources":["../../../src/services/hostingCommands.service.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAA4B,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAE9F,cAAM,sBAAuB,SAAQ,SAAS,CAAC,cAAc,CAAC;IAE5D,KAAK,6DAAuB;IAE5B,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAc1D,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAqBvH;;AACD,wBAA4C"}
+{"version":3,"file":"hostingCommands.service.d.ts","sourceRoot":"","sources":["../../../src/services/hostingCommands.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAA4B,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAE9F,cAAM,sBAAuB,SAAQ,SAAS,CAAC,cAAc,CAAC;IAE5D,KAAK,6DAAuB;IAEtB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAoB1D,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAuBtH,aAAa,CAAC,OAAO,EAAE,cAAc;IAqB3C,IAAI,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC;IAoBhD,OAAO,CAAC,KAAK,SAAK;;;;CAqBzB;;AACD,wBAA4C"}

package/lib/src/services/hostingCommands.service.js

@@ -10,16 +10,19 @@ class HostingCommandsService extends Immutable_class_1.default {
         super(...arguments);
         this.model = hostingCommand_model_1.default;
     }
-    nginx(command, user, app) {
-        return this.create({
+    async nginx(command, user, app) {
+        const commandObject = {
             target: 'nginx',
             command,
             date: new Date(),
             state: 'new',
             data: {},
-        }, user, app);
+        };
+        if (await this.checkIfExists(commandObject))
+            return Promise.resolve();
+        return this.create(commandObject, user, app);
     }
-    docker(command, company, project, user, app) {
+    async docker(command, company, project, user, app) {
         const commandObject = {
             target: 'docker',
             command,
@@ -31,8 +34,44 @@ class HostingCommandsService extends Immutable_class_1.default {
             commandObject.company = company;
             commandObject.project = project;
         }
+        if (await this.checkIfExists(commandObject))
+            return Promise.resolve();
         return this.create(commandObject, user, app);
     }
+    async checkIfExists(command) {
+        const countObject = {
+            target: command.target,
+            state: 'new',
+            command: command.command,
+        };
+        if (command.company && command.project) {
+            countObject.company = command.company;
+            countObject.project = command.project;
+        }
+        const commands = await this.model.db.countDocuments(countObject);
+        return commands > 0;
+    }
+    list(after, state) {
+        const filter = {};
+        if (after) {
+            filter._id = { $gt: after };
+        }
+        if (state) {
+            filter.state = state;
+        }
+        return this.model.db.find(filter).sort({ _id: 1 }).limit(10).toArray();
+    }
+    async listNew(limit = 30) {
+        const count = await this.model.db.countDocuments({ state: 'new' });
+        const commandsList = await this.model.db.find({ state: 'new' }, { projection: { history: 0, data: 0 } })
+            .sort({ _id: 1 })
+            .limit(limit)
+            .toArray();
+        commandsList.forEach(async (single) => {
+            await this.immutable({ _id: single._id }, { state: 'inProgress' }, 'system', 'change', 'system');
+        });
+        return { data: commandsList, more: count > limit };
+    }
 }
 exports.default = new HostingCommandsService();
 //# sourceMappingURL=hostingCommands.service.js.map

package/lib/src/services/hostingCommands.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"hostingCommands.service.js","sourceRoot":"","sources":["../../../src/services/hostingCommands.service.ts"],"names":[],"mappings":";;;;;AAAA,yEAA2C;AAC3C,0FAA8F;AAE9F,MAAM,sBAAuB,SAAQ,yBAAyB;IAA9D;;QAEE,UAAK,GAAG,8BAAmB,CAAC;IAqC9B,CAAC;IAnCC,KAAK,CAAC,OAAyB,EAAE,IAAY,EAAE,GAAW;QAExD,OAAO,IAAI,CAAC,MAAM,CAAC;YACjB,MAAM,EAAE,OAAO;YACf,OAAO;YACP,IAAI,EAAE,IAAI,IAAI,EAAE;YAChB,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,EAAE;SACT,EACD,IAAI,EACJ,GAAG,CAAC,CAAC;IAEP,CAAC;IAED,MAAM,CAAC,OAA0B,EAAE,OAA2B,EAAE,OAA2B,EAAE,IAAY,EAAE,GAAW;QAEpH,MAAM,aAAa,GAAmB;YACpC,MAAM,EAAE,QAAQ;YAChB,OAAO;YACP,IAAI,EAAE,IAAI,IAAI,EAAE;YAChB,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,EAAE;SACT,CAAC;QAEF,IAAI,OAAO,IAAI,OAAO,EAAE;YAEtB,aAAa,CAAC,OAAO,GAAG,OAAO,CAAC;YAChC,aAAa,CAAC,OAAO,GAAG,OAAO,CAAC;SAEjC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAE/C,CAAC;CAEF;AACD,kBAAe,IAAI,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"hostingCommands.service.js","sourceRoot":"","sources":["../../../src/services/hostingCommands.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lilaquadrat/studio",
-  "version": "2.4.33",
+  "version": "2.4.34",
   "description": "classes and tools for STUDIO",
   "license": "MIT",
   "homepage": "https://lilaquadrat.de",