@brimble/models 1.5.7 → 1.5.8

package/.turbo/turbo-build.log

@@ -1 +1,3 @@
+yarn run v1.22.19
 $ tsc -p .
+Done in 3.65s.

package/dist/domain.js

@@ -24,10 +24,17 @@ const domainSchema = new mongoose_1.Schema({
         type: Boolean,
         default: false,
     },
-    ssl: {
-        type: Object,
-        default: {},
-        select: false,
+    isPurchased: {
+        type: Boolean,
+        default: false
+    },
+    isFree: {
+        type: Boolean,
+        default: false
+    },
+    preview: {
+        ref: "Preview",
+        type: mongoose_1.Schema.Types.ObjectId,
     },
 }, { timestamps: true });
 exports.default = (0, mongoose_1.model)("Domain", domainSchema);

package/dist/enum/index.d.ts

@@ -5,7 +5,7 @@ export declare enum GIT_TYPE {
 }
 export declare enum ENVIRONMENT {
     DEVELOPMENT = "DEVELOPMENT",
-    STAGING = "STAGING",
+    PREVIEW = "PREVIEW",
     PRODUCTION = "PRODUCTION"
 }
 export declare enum INTEGRATION_TYPES {

package/dist/enum/index.js

@@ -10,7 +10,7 @@ var GIT_TYPE;
 var ENVIRONMENT;
 (function (ENVIRONMENT) {
     ENVIRONMENT["DEVELOPMENT"] = "DEVELOPMENT";
-    ENVIRONMENT["STAGING"] = "STAGING";
+    ENVIRONMENT["PREVIEW"] = "PREVIEW";
     ENVIRONMENT["PRODUCTION"] = "PRODUCTION";
 })(ENVIRONMENT = exports.ENVIRONMENT || (exports.ENVIRONMENT = {}));
 var INTEGRATION_TYPES;

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { default as User } from "./user";
 export { default as Project } from "./project";
+export { default as Preview } from "./project/preview";
 export { default as Following } from "./following";
 export { default as Integration } from "./integration";
 export { default as Domain } from "./domain";
@@ -12,8 +13,8 @@ export { default as SubscriptionPlan } from "./subscription";
 export { default as Card } from "./card";
 export { default as Server } from "./server";
 export { default as Tenancy } from "./tenancy";
-export { IUser, IGit, IProject, IFollowing, IIntegration, IEnv, IServer, ITenancy, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscription, ICard } from "./types";
-export { GIT_TYPE, INTEGRATION_TYPES, INTEGRATION_PROVIDERS, OAUTH_PERMISSIONS, ENVIRONMENT, SERVER_STATUS, ROLES, PROJECT_STATUS, SUBSCRIPTION_STATUS, CARD_TYPES } from "./enum";
+export { IUser, IGit, IProject, IPreview, IFollowing, IIntegration, IEnv, IServer, ITenancy, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscription, ICard, } from "./types";
+export { GIT_TYPE, INTEGRATION_TYPES, INTEGRATION_PROVIDERS, OAUTH_PERMISSIONS, ENVIRONMENT, SERVER_STATUS, ROLES, PROJECT_STATUS, SUBSCRIPTION_STATUS, CARD_TYPES, } from "./enum";
 import mongoose from "mongoose";
 export declare const connectToMongo: (mongoUrl: string, config?: mongoose.ConnectOptions) => Promise<void>;
 export declare const db: mongoose.Connection;

package/dist/index.js

@@ -12,11 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeMongo = exports.db = exports.connectToMongo = exports.CARD_TYPES = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.ROLES = exports.SERVER_STATUS = exports.ENVIRONMENT = exports.OAUTH_PERMISSIONS = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.GIT_TYPE = exports.Tenancy = exports.Server = exports.Card = exports.SubscriptionPlan = exports.Log = exports.Member = exports.Team = exports.Token = exports.Env = exports.Domain = exports.Integration = exports.Following = exports.Project = exports.User = void 0;
+exports.closeMongo = exports.db = exports.connectToMongo = exports.CARD_TYPES = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.ROLES = exports.SERVER_STATUS = exports.ENVIRONMENT = exports.OAUTH_PERMISSIONS = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.GIT_TYPE = exports.Tenancy = exports.Server = exports.Card = exports.SubscriptionPlan = exports.Log = exports.Member = exports.Team = exports.Token = exports.Env = exports.Domain = exports.Integration = exports.Following = exports.Preview = exports.Project = exports.User = void 0;
 var user_1 = require("./user");
 Object.defineProperty(exports, "User", { enumerable: true, get: function () { return __importDefault(user_1).default; } });
 var project_1 = require("./project");
 Object.defineProperty(exports, "Project", { enumerable: true, get: function () { return __importDefault(project_1).default; } });
+var preview_1 = require("./project/preview");
+Object.defineProperty(exports, "Preview", { enumerable: true, get: function () { return __importDefault(preview_1).default; } });
 var following_1 = require("./following");
 Object.defineProperty(exports, "Following", { enumerable: true, get: function () { return __importDefault(following_1).default; } });
 var integration_1 = require("./integration");

package/dist/logs.js

@@ -18,6 +18,11 @@ const LogSchema = new mongoose_1.Schema({
         ref: "User",
         type: mongoose_1.Schema.Types.ObjectId,
     },
+    environment: {
+        type: String,
+        enum: Object.values(enum_1.ENVIRONMENT),
+        default: enum_1.ENVIRONMENT.PRODUCTION,
+    },
     jobs: Array,
     startTime: mongoose_1.Schema.Types.Date,
     endTime: mongoose_1.Schema.Types.Date,

package/dist/project/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="mongoose" />
+import { IProject } from "../types";
+declare const _default: import("mongoose").Model<IProject, {}, {}>;
+export default _default;

package/dist/project/index.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoose_1 = require("mongoose");
+const enum_1 = require("../enum");
+const projectSchema = new mongoose_1.Schema({
+    name: {
+        type: String,
+        required: true,
+        unique: true,
+    },
+    uuid: {
+        type: Number,
+        required: true,
+        unique: true,
+    },
+    user_id: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "User",
+        required: true,
+    },
+    domains: [
+        {
+            ref: "Domain",
+            type: mongoose_1.Schema.Types.ObjectId,
+        },
+    ],
+    environments: [
+        {
+            ref: "Env",
+            type: mongoose_1.Schema.Types.ObjectId,
+        },
+    ],
+    team: {
+        ref: "Team",
+        type: mongoose_1.Schema.Types.ObjectId,
+    },
+    server: {
+        ref: "Server",
+        type: mongoose_1.Schema.Types.ObjectId,
+    },
+    pid: Number,
+    port: Number,
+    ip: String,
+    dir: String,
+    buildCommand: String,
+    outputDirectory: String,
+    installCommand: String,
+    repo: Object,
+    rootDir: String,
+    isPrivate: {
+        type: Boolean,
+        default: false,
+    },
+    status: {
+        type: String,
+        enum: Object.values(enum_1.PROJECT_STATUS),
+        default: enum_1.PROJECT_STATUS.PENDING,
+    },
+    framework: String,
+    description: String,
+    logs: [
+        {
+            ref: "Log",
+            type: mongoose_1.Schema.Types.ObjectId,
+        },
+    ],
+    log: {
+        ref: "Log",
+        type: mongoose_1.Schema.Types.ObjectId,
+    },
+    maintenance: {
+        type: Boolean,
+        default: false,
+    },
+    passwordEnabled: {
+        type: Boolean,
+        default: false,
+    },
+    password: {
+        type: String,
+        default: null,
+    },
+    screenshot: String,
+    lastProcessed: Number,
+    tracking_token: String,
+    previews: [
+        {
+            ref: "Preview",
+            type: mongoose_1.Schema.Types.ObjectId,
+        },
+    ],
+}, { timestamps: true });
+exports.default = (0, mongoose_1.model)("Project", projectSchema);

package/dist/project/preview.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="mongoose" />
+import { IPreview } from "../types";
+declare const _default: import("mongoose").Model<IPreview, {}, {}>;
+export default _default;

package/dist/project/preview.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoose_1 = require("mongoose");
+const previewsSchema = new mongoose_1.Schema({
+    name: String,
+    project: {
+        ref: "Project",
+        type: mongoose_1.Schema.Types.ObjectId,
+    },
+    server: {
+        ref: "Server",
+        type: mongoose_1.Schema.Types.ObjectId,
+    },
+    pid: Number,
+    port: Number,
+    ip: String,
+    dir: String,
+    branch: String,
+}, { timestamps: true });
+exports.default = (0, mongoose_1.model)("Preview", previewsSchema);

package/dist/types/domain.d.ts

@@ -1,15 +1,12 @@
 import { Document } from "mongoose";
-import { IProject } from "./";
+import { IPreview, IProject } from "./";
 export interface IDomain extends Document {
     name: string;
     project: IProject;
     user_id: string;
     team_id: string;
     primary: boolean;
-    ssl?: {
-        enabled: boolean;
-        cert: string;
-        key: string;
-        expiry: Date;
-    };
+    preview: IPreview;
+    isPurchased: boolean;
+    isFree: boolean;
 }

package/dist/types/index.d.ts

@@ -2,6 +2,7 @@ export { IUser } from "./user";
 export { IGit } from "./git";
 export { IFollowing } from "./following";
 export { IProject } from "./project";
+export { IPreview } from "./project/preview";
 export { IIntegration } from "./integration";
 export { IEnv } from "./env";
 export { IDomain } from "./domain";

package/dist/types/logs.d.ts

@@ -1,5 +1,5 @@
 import { Document } from "mongoose";
-import { PROJECT_STATUS } from "../enum";
+import { ENVIRONMENT, PROJECT_STATUS } from "../enum";
 import { IProject } from "./project";
 import { IUser } from "./user";
 export interface ILog extends Document {
@@ -22,6 +22,7 @@ export interface ILog extends Document {
         id: number;
         name: string;
     }[];
+    environment: ENVIRONMENT;
     startTime: Date | string;
     endTime: Date | string;
     createdAt: Date | string;

package/dist/types/project/index.d.ts

@@ -0,0 +1,48 @@
+import { Document } from "mongoose";
+import { GIT_TYPE, PROJECT_STATUS } from "../../enum";
+import { IDomain } from "../domain";
+import { IEnv } from "../env";
+import { ILog } from "../logs";
+import { ITeam } from "../team";
+import { IUser } from "../user";
+import { IServer } from "../server";
+import { IPreview } from "./preview";
+export interface IProject extends Document {
+    name: string;
+    domains: Array<IDomain>;
+    environments: Array<IEnv>;
+    uuid: number;
+    pid: number;
+    port: number;
+    ip: string;
+    dir: string;
+    buildCommand: string;
+    outputDirectory: string;
+    user_id: IUser;
+    repo: {
+        name: string;
+        full_name: string;
+        id: number;
+        branch: string;
+        installationId: number;
+        git: GIT_TYPE;
+    };
+    rootDir?: string;
+    team: ITeam;
+    server: IServer;
+    isPrivate: boolean;
+    status: PROJECT_STATUS;
+    framework: string;
+    description: string;
+    logs: Array<ILog>;
+    log: ILog;
+    maintenance: boolean;
+    passwordEnabled: boolean;
+    password: string | null;
+    screenshot: string;
+    createdAt: Date;
+    updatedAt: Date;
+    lastProcessed: number;
+    tracking_token: string;
+    previews: IPreview[];
+}

package/dist/types/project/index.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/project/preview.d.ts

@@ -0,0 +1,13 @@
+import { Document } from "mongoose";
+import { IServer } from "../server";
+import { IProject } from ".";
+export interface IPreview extends Document {
+    name: string;
+    pid: number;
+    port: number;
+    ip: string;
+    dir: string;
+    branch: string;
+    server: IServer;
+    project: IProject;
+}

package/dist/types/project/preview.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/domain.ts

@@ -1,5 +1,6 @@
 import { model, Schema } from "mongoose";
 import { IDomain } from "./types";
+import { ENVIRONMENT } from "./enum";
 
 const domainSchema = new Schema(
   {
@@ -25,10 +26,17 @@ const domainSchema = new Schema(
       type: Boolean,
       default: false,
     },
-    ssl: {
-      type: Object,
-      default: {},
-      select: false,
+    isPurchased: {
+      type: Boolean,
+      default: false
+    },
+    isFree: {
+      type: Boolean,
+      default: false
+    },
+    preview: {
+      ref: "Preview",
+      type: Schema.Types.ObjectId,
     },
   },
   { timestamps: true },

package/enum/index.ts

@@ -6,7 +6,7 @@ export enum GIT_TYPE {
 
 export enum ENVIRONMENT {
   DEVELOPMENT = "DEVELOPMENT",
-  STAGING = "STAGING",
+  PREVIEW = "PREVIEW",
   PRODUCTION = "PRODUCTION",
 }
 

package/index.ts

@@ -1,5 +1,6 @@
 export { default as User } from "./user";
 export { default as Project } from "./project";
+export { default as Preview } from "./project/preview";
 export { default as Following } from "./following";
 export { default as Integration } from "./integration";
 export { default as Domain } from "./domain";
@@ -17,6 +18,7 @@ export {
   IUser,
   IGit,
   IProject,
+  IPreview,
   IFollowing,
   IIntegration,
   IEnv,
@@ -29,7 +31,7 @@ export {
   IInstalledIntegration,
   ILog,
   ISubscription,
-  ICard
+  ICard,
 } from "./types";
 export {
   GIT_TYPE,
@@ -41,27 +43,30 @@ export {
   ROLES,
   PROJECT_STATUS,
   SUBSCRIPTION_STATUS,
-  CARD_TYPES
+  CARD_TYPES,
 } from "./enum";
 
 import mongoose from "mongoose";
 import { log } from "@brimble/utils";
 
-export const connectToMongo = async (mongoUrl: string, config?: mongoose.ConnectOptions): Promise<void> => {
+export const connectToMongo = async (
+  mongoUrl: string,
+  config?: mongoose.ConnectOptions,
+): Promise<void> => {
   const options: mongoose.ConnectOptions = {
     useNewUrlParser: true,
     useUnifiedTopology: true,
     poolSize: 10,
     socketTimeoutMS: 30000,
     checkServerIdentity: false,
-    ...config
+    ...config,
   };
   mongoose.set("useFindAndModify", false);
   mongoose.set("useCreateIndex", true);
 
   // connect to mongo
   mongoose.connect(mongoUrl, options).catch((err) => {
-    log.error(`Unable to connect to mongo db, ${err}`)
+    log.error(`Unable to connect to mongo db, ${err}`);
   });
 
   // listen for connection

package/logs.ts

@@ -1,5 +1,5 @@
 import { model, Schema } from "mongoose";
-import { PROJECT_STATUS } from "./enum";
+import { ENVIRONMENT, PROJECT_STATUS } from "./enum";
 import { ILog } from "./types";
 
 const LogSchema = new Schema(
@@ -19,6 +19,11 @@ const LogSchema = new Schema(
       ref: "User",
       type: Schema.Types.ObjectId,
     },
+    environment: {
+      type: String,
+      enum: Object.values(ENVIRONMENT),
+      default: ENVIRONMENT.PRODUCTION,
+    },
     jobs: Array,
     startTime: Schema.Types.Date,
     endTime: Schema.Types.Date,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,5 +21,5 @@
     "ts-node": "^8.10.2",
     "typescript": "^4.9.4"
   },
-  "gitHead": "253485ad1f97dcabe185fc71f1237352265add51"
+  "gitHead": "2515027996da3efffb108d1da660d81d86a1a267"
 }

package/{project.ts → project/index.ts}

@@ -1,6 +1,6 @@
 import { model, Schema } from "mongoose";
-import { PROJECT_STATUS } from "./enum";
-import { IProject } from "./types";
+import { PROJECT_STATUS } from "../enum";
+import { IProject } from "../types";
 
 const projectSchema = new Schema(
   {
@@ -75,15 +75,21 @@ const projectSchema = new Schema(
     },
     passwordEnabled: {
       type: Boolean,
-      default: false
+      default: false,
     },
     password: {
       type: String,
-      default: null
+      default: null,
     },
     screenshot: String,
     lastProcessed: Number,
     tracking_token: String,
+    previews: [
+      {
+        ref: "Preview",
+        type: Schema.Types.ObjectId,
+      },
+    ],
   },
   { timestamps: true },
 );

package/project/preview.ts

@@ -0,0 +1,24 @@
+import { Schema, model } from "mongoose";
+import { IPreview } from "../types";
+
+const previewsSchema = new Schema(
+  {
+    name: String,
+    project: {
+      ref: "Project",
+      type: Schema.Types.ObjectId,
+    },
+    server: {
+      ref: "Server",
+      type: Schema.Types.ObjectId,
+    },
+    pid: Number,
+    port: Number,
+    ip: String,
+    dir: String,
+    branch: String,
+  },
+  { timestamps: true },
+);
+
+export default model<IPreview>("Preview", previewsSchema);

package/types/domain.ts

@@ -1,5 +1,5 @@
 import { Document } from "mongoose";
-import { IProject } from "./";
+import { IPreview, IProject } from "./";
 
 export interface IDomain extends Document {
   name: string;
@@ -7,10 +7,7 @@ export interface IDomain extends Document {
   user_id: string;
   team_id: string;
   primary: boolean;
-  ssl?: {
-    enabled: boolean;
-    cert: string;
-    key: string;
-    expiry: Date;
-  };
+  preview: IPreview;
+  isPurchased: boolean;
+  isFree: boolean;
 }

package/types/index.ts

@@ -2,6 +2,7 @@ export { IUser } from "./user";
 export { IGit } from "./git";
 export { IFollowing } from "./following";
 export { IProject } from "./project";
+export { IPreview } from "./project/preview";
 export { IIntegration } from "./integration";
 export { IEnv } from "./env";
 export { IDomain } from "./domain";
@@ -13,4 +14,4 @@ export { ILog } from "./logs";
 export { ISubscription } from "./subscription";
 export { ICard } from "./card";
 export { ITenancy } from "./tenancy";
-export { IServer } from "./server";
+export { IServer } from "./server";

package/types/logs.ts

@@ -1,5 +1,5 @@
 import { Document } from "mongoose";
-import { PROJECT_STATUS } from "../enum";
+import { ENVIRONMENT, PROJECT_STATUS } from "../enum";
 import { IProject } from "./project";
 import { IUser } from "./user";
 
@@ -23,6 +23,7 @@ export interface ILog extends Document {
     id: number;
     name: string;
   }[];
+  environment: ENVIRONMENT;
   startTime: Date | string;
   endTime: Date | string;
   createdAt: Date | string;

package/types/{project.ts → project/index.ts}

@@ -1,11 +1,12 @@
 import { Document } from "mongoose";
-import { GIT_TYPE, PROJECT_STATUS } from "../enum";
-import { IDomain } from "./domain";
-import { IEnv } from "./env";
-import { ILog } from "./logs";
-import { ITeam } from "./team";
-import { IUser } from "./user";
-import { IServer } from "./server";
+import { GIT_TYPE, PROJECT_STATUS } from "../../enum";
+import { IDomain } from "../domain";
+import { IEnv } from "../env";
+import { ILog } from "../logs";
+import { ITeam } from "../team";
+import { IUser } from "../user";
+import { IServer } from "../server";
+import { IPreview } from "./preview";
 
 export interface IProject extends Document {
   name: string;
@@ -44,4 +45,5 @@ export interface IProject extends Document {
   updatedAt: Date;
   lastProcessed: number;
   tracking_token: string;
+  previews: IPreview[];
 }

package/types/project/preview.ts

@@ -0,0 +1,14 @@
+import { Document } from "mongoose";
+import { IServer } from "../server";
+import { IProject } from ".";
+
+export interface IPreview extends Document {
+  name: string;
+  pid: number;
+  port: number;
+  ip: string;
+  dir: string;
+  branch: string;
+  server: IServer;
+  project: IProject;
+}