@brimble/models 3.8.6 → 3.8.10

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

@@ -6,16 +6,18 @@ import { ILog } from "../logs";
 import { ITeam } from "../team";
 import { IUser } from "../user";
 import { IServer } from "../server";
-import { IBranch } from "../branch";
 import { IPreview } from "./preview";
 import { IDbImage } from "../db-image";
 import { IAutoScalingGroup } from "../auto-scaling-group";
+import { IProjectEnvironment } from "../project-environment";
 import { IRegion } from "../region";
 export interface IProject extends Document {
     name: string;
     healthCheckPath?: string;
     preStartCommand?: string;
     backupEnabled: boolean;
+    free_tier_expires_at?: Date | null;
+    free_tier_expiry_notified_at?: Date | null;
     buildCacheEnabled?: boolean;
     domains: Array<IDomain>;
     environments: Array<IEnv>;
@@ -33,6 +35,7 @@ export interface IProject extends Document {
     user_id: IUser;
     monitor_id: string;
     nomadJobId: string;
+    watchPaths: string[];
     repo: {
         name: string;
         full_name: string;
@@ -67,7 +70,8 @@ export interface IProject extends Document {
     tracking_token: string;
     from: string;
     previews: IPreview[];
-    branches: IBranch[];
+    project_environment?: IProjectEnvironment;
+    inherit_environment_vars: boolean;
     replicas: number;
     vaultPath: string | null;
     vaultToken: string | null;

package/dist/types/project-environment.d.ts

@@ -0,0 +1,13 @@
+import { Document } from "mongoose";
+import { ITeam } from "./team";
+import { IUser } from "./user";
+export interface IProjectEnvironment extends Document {
+    name: string;
+    slug: string;
+    owner: IUser;
+    team?: ITeam;
+    inherit_from?: IProjectEnvironment;
+    isDefault: boolean;
+    createdAt: Date;
+    updatedAt: Date;
+}

package/dist/types/project-environment.js

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

package/dist/types/project_analytics.d.ts

@@ -0,0 +1,11 @@
+import { Document, Types } from "mongoose";
+export interface IProjectAnalytics extends Document {
+    project: Types.ObjectId;
+    provider: "umami";
+    websiteId: string;
+    shareId?: string | null;
+    domain: string;
+    enabled: boolean;
+    createdAt: Date;
+    updatedAt: Date;
+}

package/dist/types/project_analytics.js

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

package/dist/types/sandbox-image.d.ts

@@ -0,0 +1,9 @@
+import { Document } from "mongoose";
+export interface ISandboxImage extends Document {
+    name: string;
+    display_name: string;
+    image: string;
+    description: string;
+    is_available: boolean;
+    is_default: boolean;
+}

package/dist/types/sandbox-image.js

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

package/dist/types/sandbox.d.ts

@@ -0,0 +1,30 @@
+import { Document, Types } from "mongoose";
+import { IUser } from "./user";
+import { ITeam } from "./team";
+import { IProjectEnvironment } from "./project-environment";
+import { SANDBOX_STATUS, SANDBOX_DESTROY_REASON } from "../enum";
+export interface ISandboxSpecs {
+    cpu: number;
+    memory: number;
+    disk: number;
+}
+export interface ISandbox extends Document {
+    user_id: IUser | Types.ObjectId;
+    team: ITeam | Types.ObjectId | null;
+    project_environment: IProjectEnvironment | Types.ObjectId | null;
+    template: string;
+    status: SANDBOX_STATUS;
+    nomad_job_id: string;
+    nomad_alloc_id: string | null;
+    host: string | null;
+    port: number | null;
+    agent_token_hash: string | null;
+    region: string;
+    specs: ISandboxSpecs;
+    created_at: Date;
+    last_activity_at: Date;
+    expires_at: Date;
+    destroyed_at: Date | null;
+    destroy_reason: SANDBOX_DESTROY_REASON | null;
+    isDeleted: boolean;
+}

package/dist/types/sandbox.js

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

package/dist/types/team.d.ts

@@ -1,14 +1,22 @@
-import { Document } from "mongoose";
-import { IMember, IProject, ISubscription } from "./";
+import { Document, Types } from "mongoose";
+import { IMember, IProject, ISubscription, IUser } from "./";
 import { BUILD_DISABLED_BY } from "../enum";
 export interface ITeam extends Document {
     name: string;
     description: string;
+    size: number;
     members: IMember[];
     projects: IProject[];
+    ai_usage_count: number;
     image: string;
     isCreator: boolean;
+    build_minutes: number;
+    build_minutes_last_reset_at: Date | null;
+    build_minutes_cycle_anchor: Date | null;
     build_disabled: boolean;
     build_disabled_by: BUILD_DISABLED_BY;
     subscription: ISubscription;
+    enforce_2fa: boolean;
+    enforce_2fa_at: Date | null;
+    enforce_2fa_by: IUser | Types.ObjectId | null;
 }

package/dist/types/user.d.ts

@@ -12,6 +12,7 @@ export interface IUser extends Document {
     verification_token: number;
     token?: string;
     company?: string;
+    ai_usage_count: number;
     github: IGit;
     gitlab: IGit;
     location: string;
@@ -30,10 +31,12 @@ export interface IUser extends Document {
     build_minutes: number;
     disabled: boolean;
     disabled_at: Date;
+    has_payment_method: boolean;
     notifications: {
         email: boolean;
         mute: boolean;
     };
+    totp_enabled?: boolean;
     created_at: Date;
     updated_at: Date;
 }

package/dist/types/wallet.d.ts

@@ -1,4 +1,8 @@
 import { Document } from "mongoose";
 export interface IWallet extends Document {
     balance: number;
+    slug: string;
+    enabled: boolean;
+    provider: string;
+    discounted: boolean;
 }

package/dist/user.js

@@ -39,6 +39,11 @@ const userSchema = new mongoose_1.Schema({
         type: String,
         required: false,
     },
+    ai_usage_count: {
+        type: Number,
+        default: 0,
+        required: false
+    },
     tenant: { type: mongoose_1.Schema.Types.ObjectId, ref: "Tenancy", required: false },
     is_waitlist: { type: Boolean, default: true },
     spending_limit: { type: Number },
@@ -46,6 +51,8 @@ const userSchema = new mongoose_1.Schema({
     notifications: Object,
     disabled: Boolean,
     disabled_at: Date,
+    has_payment_method: Boolean,
+    totp_enabled: { type: Boolean, default: false },
 }, {
     timestamps: {
         createdAt: "created_at",

package/dist/wallet.js

@@ -6,5 +6,21 @@ const walletSchema = new mongoose_1.Schema({
         type: Number,
         required: true,
     },
+    enabled: {
+        type: Boolean,
+        default: true,
+    },
+    slug: {
+        type: String,
+        required: true,
+    },
+    provider: {
+        type: String,
+        required: true,
+    },
+    discounted: {
+        type: Boolean,
+        default: false
+    }
 });
 exports.default = (0, mongoose_1.model)("Wallet", walletSchema);

package/domain/index.ts

@@ -91,6 +91,12 @@ const domainSchema = new Schema(
         type: Schema.Types.ObjectId,
       },
     ],
+    project_environment: {
+      ref: "ProjectEnvironment",
+      type: Schema.Types.ObjectId,
+      required: false,
+      default: null,
+    },
     is_pending_verification: Boolean,
     redirect: {
       url: String,

package/enum/index.ts

@@ -16,6 +16,7 @@ export enum SERVER_PROTOCOL {
 export enum BUILD_DISABLED_BY {
   System = "system",
   User = "user",
+  Payment = "payment_failure"
 }
 
 export enum REQUEST_TYPE {
@@ -111,6 +112,7 @@ export enum ROLES {
   CREATOR = "CREATOR",
   ADMINISTRATOR = "ADMINISTRATOR",
   MEMBER = "MEMBER",
+  VIEWER = "VIEWER"
 }
 
 export enum PERMISSION_TYPE {
@@ -212,11 +214,6 @@ export enum NomadDeploymentStatus {
   NOMAD_FAILED = 'nomad_failed',
 }
 
-export enum BRANCH_TYPE {
-  USER_CREATED = "USER_CREATED",
-  PREVIEW = "PREVIEW",
-}
-
 export enum COLLAB_ANNOTATION_STATUS {
   OPEN = "open",
   RESOLVED = "resolved",
@@ -258,3 +255,22 @@ export enum INVOICE_TYPE {
   INVOICE = "invoice",
   RECEIPT = "receipt",
 }
+
+export enum SANDBOX_TEMPLATE {
+  PYTHON = "python",
+  NODE = "node",
+}
+
+export enum SANDBOX_STATUS {
+  STARTING = "starting",
+  READY = "ready",
+  FAILED = "failed",
+  DESTROYED = "destroyed",
+}
+
+export enum SANDBOX_DESTROY_REASON {
+  USER = "user",
+  IDLE_TTL = "idle_ttl",
+  MAX_LIFETIME = "max_lifetime",
+  FAILED = "failed",
+}

package/env.ts

@@ -26,14 +26,6 @@ const envSchema = new Schema(
       default: ENVIRONMENT.PRODUCTION,
       required: true,
     },
-    branch: {
-      ref: "Branch",
-      type: Schema.Types.ObjectId,
-    },
-    inheritable: {
-      type: Boolean,
-      default: true,
-    },
     is_system: {
       type: Boolean,
       default: false,

package/environment-variable.ts

@@ -0,0 +1,21 @@
+import { model, Schema } from "mongoose";
+import { IEnvironmentVariable } from "./types";
+
+const environmentVariableSchema = new Schema(
+  {
+    name: { type: String, required: true },
+    value: { type: String, required: true },
+    project_environment: {
+      ref: "ProjectEnvironment",
+      type: Schema.Types.ObjectId,
+      required: true,
+    },
+    user: { ref: "User", type: Schema.Types.ObjectId, required: true },
+    inheritable: { type: Boolean, default: true },
+  },
+  { timestamps: true },
+);
+
+environmentVariableSchema.index({ name: 1, project_environment: 1 }, { unique: true });
+
+export default model<IEnvironmentVariable>("EnvironmentVariable", environmentVariableSchema);

package/framework.ts

@@ -25,6 +25,11 @@ const frameworkSchema: Schema = new Schema(
       required: false,
       default: true
     },
+    port: {
+      type: Number,
+      required: false,
+      default: 8000
+    },
     tagline: {
       type: String,
       required: false,

package/index.ts

@@ -1,5 +1,6 @@
 export { default as User } from "./user";
 export { default as Project, DeletedProject } from "./project";
+export { default as ProjectAnalytics } from "./project_analytics";
 export { default as Preview } from "./project/preview";
 export { default as ProjectConnection } from "./project/connection";
 export { default as Following } from "./following";
@@ -36,7 +37,6 @@ export { default as WebhookEvent } from "./webhook-event";
 export { default as WebhookSetting } from "./webhook-setting";
 export { default as Intention } from "./intention";
 export { default as Provider } from "./provider";
-export { default as Branch } from "./branch";
 export { default as CollabAnnotation } from "./collab-annotation";
 export { default as CollabComment } from "./collab-comment";
 export { default as CollabIntegration } from "./collab-integration";
@@ -49,11 +49,18 @@ export { default as Tag } from "./tag";
 export { default as ProjectTagAssignment } from "./project-tag-assignment";
 export { default as CashierSubscription } from "./cashier_subscription";
 export { default as CashierSubscriptionItem } from "./cashier_subscription_item";
+export { default as ProjectEnvironment } from "./project-environment";
+export { default as EnvironmentVariable } from "./environment-variable";
+export { default as ActivityLog } from "./activity-log";
+export { default as OwnershipTransfer } from "./ownership-transfer";
+export { default as Sandbox } from "./sandbox";
+export { default as SandboxImage } from "./sandbox-image";
 
 export {
   IUser,
   IGit,
   IProject,
+  IProjectAnalytics,
   IPreview,
   IProjectConnection,
   IFollowing,
@@ -92,7 +99,6 @@ export {
   IWebhookSetting,
   IIntention,
   IProvider,
-  IBranch,
   ICollabAnnotation,
   ICollabComment,
   ICollabAttachment,
@@ -106,6 +112,13 @@ export {
   IProjectTagAssignment,
   ICashierSubscription,
   ICashierSubscriptionItem,
+  IProjectEnvironment,
+  IEnvironmentVariable,
+  IActivityLog,
+  IOwnershipTransfer,
+  ISandbox,
+  ISandboxSpecs,
+  ISandboxImage,
 } from "./types";
 export {
   GIT_TYPE,
@@ -135,14 +148,16 @@ export {
   DomainTransferDirection,
   DomainTransferStatus,
   NomadDeploymentStatus,
-  BRANCH_TYPE,
   COLLAB_ANNOTATION_STATUS,
   COLLAB_INTEGRATION_TYPE,
   COLLAB_THEME,
   COLLAB_TOOLBAR_POSITION,
   INVOICE_STATUS,
   INVOICE_PAYMENT_STATUS,
-  INVOICE_TYPE
+  INVOICE_TYPE,
+  SANDBOX_TEMPLATE,
+  SANDBOX_STATUS,
+  SANDBOX_DESTROY_REASON,
 } from "./enum";
 
 import mongoose from "mongoose";

package/member.ts

@@ -31,6 +31,7 @@ const memberSchema: Schema = new Schema(
       default: false,
     },
     permissions: [{ type: Schema.Types.ObjectId, ref: "MemberPermission" }],
+    project_environments: [{ type: Schema.Types.ObjectId, ref: "ProjectEnvironment" }],
   },
   {
     timestamps: {

package/ownership-transfer.ts

@@ -0,0 +1,42 @@
+import { model, Schema } from "mongoose";
+import { IOwnershipTransfer } from "./types";
+
+const ownershipTransferSchema: Schema = new Schema(
+  {
+    team: {
+      type: Schema.Types.ObjectId,
+      ref: "Team",
+      required: true,
+    },
+    from_user: {
+      type: Schema.Types.ObjectId,
+      ref: "User",
+      required: true,
+    },
+    to_user: {
+      type: Schema.Types.ObjectId,
+      ref: "User",
+      required: true,
+    },
+    status: {
+      type: String,
+      enum: ["pending", "accepted", "denied", "expired"],
+      default: "pending",
+    },
+    expires_at: {
+      type: Date,
+      required: true,
+    },
+  },
+  {
+    timestamps: {
+      createdAt: "created_at",
+      updatedAt: "updated_at",
+    },
+  },
+);
+
+export default model<IOwnershipTransfer>(
+  "OwnershipTransfer",
+  ownershipTransferSchema,
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "3.8.6",
+  "version": "3.8.10",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plan_configuration.ts

@@ -16,10 +16,13 @@ const PlanConfigurationSchema = new Schema<IPlanConfiguration>(
     log_retention: { type: Number, required: true },
     bandwidth: { type: Number, required: true },
     price: { type: Number, required: true },
+    password_enabled: { type: Boolean, required: false, default: true },
     autoscaling_enabled: { type: Boolean, default: false, required: false },
     region: { type: Schema.Types.ObjectId, ref: "Region", required: false },
     multi_region: { type: Boolean, default: false },
     unlimited_projects: { type: Boolean, default: false },
+    ai_debug_enabled: { type: Boolean, default: false, required: false },
+    ai_debug_limit: { type: Number, default: 0, required: false },
     plan_type: {
       type: String,
       enum: Object.values(SUBSCRIPTION_PLAN_TYPE),
@@ -37,6 +40,8 @@ const PlanConfigurationSchema = new Schema<IPlanConfiguration>(
     webhook_enabled: { type: Boolean, required: true, default: false },
     can_deploy_all_applications: { type: Boolean, required: true, default: false },
     stripe_prices: { type: Schema.Types.Mixed, required: false, default: {} },
+    sandbox_max_count: { type: Number, required: false, default: 3 },
+    sandbox_enabled: { type: Boolean, required: false, default: true }
   },
   { timestamps: true },
 );

package/project/index.ts

@@ -47,6 +47,11 @@ const projectSchema = new Schema(
       ref: "Team",
       type: Schema.Types.ObjectId,
     },
+    watchPaths: {
+      type: Array,
+      required: false,
+      default: [],
+    },
     server: {
       ref: "Server",
       type: Schema.Types.ObjectId,
@@ -102,6 +107,14 @@ const projectSchema = new Schema(
       type: Boolean,
       default: false,
     },
+    free_tier_expires_at: {
+      type: Date,
+      default: null,
+    },
+    free_tier_expiry_notified_at: {
+      type: Date,
+      default: null,
+    },
     disabled: {
       type: Boolean,
       default: false,
@@ -131,12 +144,15 @@ const projectSchema = new Schema(
         type: Schema.Types.ObjectId,
       },
     ],
-    branches: [
-      {
-        ref: "Branch",
-        type: Schema.Types.ObjectId,
-      },
-    ],
+    project_environment: {
+      ref: "ProjectEnvironment",
+      type: Schema.Types.ObjectId,
+      index: true,
+    },
+    inherit_environment_vars: {
+      type: Boolean,
+      default: true,
+    },
     replicas: {
       type: Number,
       default: 3,
@@ -226,5 +242,15 @@ const projectSchema = new Schema(
   { timestamps: true },
 );
 
+// Partial index for the free-tier lifecycle crons. Restricts the index to
+// rows that actually carry an expiry, so paid/legacy projects stay out of it.
+projectSchema.index(
+  { free_tier_expires_at: 1, serviceType: 1, status: 1 },
+  {
+    partialFilterExpression: { free_tier_expires_at: { $type: "date" } },
+    name: "free_tier_lifecycle",
+  },
+);
+
 export default model<IProject>("Project", projectSchema);
 export const DeletedProject = model<IProject>("DeletedProject", projectSchema);

package/project-environment.ts

@@ -0,0 +1,18 @@
+import { model, Schema } from "mongoose";
+import { IProjectEnvironment } from "./types";
+
+const projectEnvironmentSchema = new Schema(
+  {
+    name: { type: String, required: true },
+    slug: { type: String, required: true },
+    owner: { ref: "User", type: Schema.Types.ObjectId, required: true },
+    team: { ref: "Team", type: Schema.Types.ObjectId },
+    inherit_from: { ref: "ProjectEnvironment", type: Schema.Types.ObjectId },
+    isDefault: { type: Boolean, default: false },
+  },
+  { timestamps: true },
+);
+
+projectEnvironmentSchema.index({ slug: 1, owner: 1, team: 1 }, { unique: true });
+
+export default model<IProjectEnvironment>("ProjectEnvironment", projectEnvironmentSchema);

package/project_analytics.ts

@@ -0,0 +1,26 @@
+import { Schema, model } from "mongoose";
+import { IProjectAnalytics } from "./types/project_analytics";
+
+const ProjectAnalyticsSchema = new Schema<IProjectAnalytics>(
+  {
+    project: {
+      type: Schema.Types.ObjectId,
+      ref: "Project",
+      required: true,
+      unique: true,
+      index: true,
+    },
+    provider: { type: String, enum: ["umami"], required: true, default: "umami" },
+    websiteId: { type: String, required: true, unique: true },
+    shareId: { type: String, default: null },
+    domain: { type: String, required: true },
+    enabled: { type: Boolean, default: true },
+  },
+  { timestamps: true },
+);
+
+export default model<IProjectAnalytics>(
+  "ProjectAnalytics",
+  ProjectAnalyticsSchema,
+  "project_analytics",
+);

package/sandbox-image.ts

@@ -0,0 +1,35 @@
+import { model, Schema } from "mongoose";
+import { ISandboxImage } from "./types/sandbox-image";
+
+const sandboxImageSchema = new Schema(
+  {
+    name: {
+      type: String,
+      required: true,
+      unique: true,
+    },
+    display_name: {
+      type: String,
+      required: true,
+    },
+    image: {
+      type: String,
+      required: true,
+    },
+    description: {
+      type: String,
+      required: true,
+    },
+    is_available: {
+      type: Boolean,
+      default: true,
+    },
+    is_default: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  { timestamps: true },
+);
+
+export default model<ISandboxImage>("SandboxImage", sandboxImageSchema);