@brimble/models 3.8.38 → 3.8.41

package/dist/webhook-event.d.ts

@@ -1,30 +1,9 @@
-/// <reference types="mongoose/types/aggregate" />
-/// <reference types="mongoose/types/callback" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/cursor" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/expressions" />
-/// <reference types="mongoose/types/helpers" />
-/// <reference types="mongoose/types/middlewares" />
-/// <reference types="mongoose/types/indexes" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/mongooseoptions" />
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
-/// <reference types="mongoose/types/session" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose" />
-/// <reference types="mongoose/types/inferschematype" />
 import { IWebhookEvent } from "./types/webhook-event";
-declare const _default: import("mongoose").Model<IWebhookEvent, {}, {}, {}, import("mongoose").Document<unknown, {}, IWebhookEvent> & IWebhookEvent & {
+declare const _default: import("mongoose").Model<IWebhookEvent, {}, {}, {}, import("mongoose").Document<unknown, {}, IWebhookEvent, {}, import("mongoose").DefaultSchemaOptions> & IWebhookEvent & Required<{
     _id: import("mongoose").Types.ObjectId;
-}, any>;
+}> & {
+    __v: number;
+} & {
+    id: string;
+}, any, IWebhookEvent>;
 export default _default;

package/dist/webhook-setting.d.ts

@@ -1,30 +1,9 @@
-/// <reference types="mongoose/types/aggregate" />
-/// <reference types="mongoose/types/callback" />
-/// <reference types="mongoose/types/collection" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose/types/cursor" />
-/// <reference types="mongoose/types/document" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/expressions" />
-/// <reference types="mongoose/types/helpers" />
-/// <reference types="mongoose/types/middlewares" />
-/// <reference types="mongoose/types/indexes" />
-/// <reference types="mongoose/types/models" />
-/// <reference types="mongoose/types/mongooseoptions" />
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/populate" />
-/// <reference types="mongoose/types/query" />
-/// <reference types="mongoose/types/schemaoptions" />
-/// <reference types="mongoose/types/schematypes" />
-/// <reference types="mongoose/types/session" />
-/// <reference types="mongoose/types/types" />
-/// <reference types="mongoose/types/utility" />
-/// <reference types="mongoose/types/validation" />
-/// <reference types="mongoose/types/virtuals" />
-/// <reference types="mongoose" />
-/// <reference types="mongoose/types/inferschematype" />
 import { IWebhookSetting } from "./types/webhook-setting";
-declare const _default: import("mongoose").Model<IWebhookSetting, {}, {}, {}, import("mongoose").Document<unknown, {}, IWebhookSetting> & IWebhookSetting & {
+declare const _default: import("mongoose").Model<IWebhookSetting, {}, {}, {}, import("mongoose").Document<unknown, {}, IWebhookSetting, {}, import("mongoose").DefaultSchemaOptions> & IWebhookSetting & Required<{
     _id: import("mongoose").Types.ObjectId;
-}, any>;
+}> & {
+    __v: number;
+} & {
+    id: string;
+}, any, IWebhookSetting>;
 export default _default;

package/enum/index.ts

@@ -285,3 +285,21 @@ export enum SANDBOX_SNAPSHOT_STATUS {
   READY = "ready",
   FAILED = "failed",
 }
+
+export enum StorageBucketStatus {
+  Active = "active",
+  Deleting = "deleting",
+  Deleted = "deleted",
+}
+
+export enum StorageUploadStatus {
+  Pending = "pending",
+  Completed = "completed",
+  Aborted = "aborted",
+  Expired = "expired",
+}
+
+export enum StorageTokenStatus {
+  Active = "active",
+  Revoked = "revoked",
+}

package/idempotency.ts

@@ -0,0 +1,22 @@
+import { model, Schema } from "mongoose";
+import { IIdempotencyRecord } from "./types/idempotency";
+
+const IdempotencyRecordSchema = new Schema<IIdempotencyRecord>(
+  {
+    _id: { type: String, required: true },
+    endpoint: { type: String, required: true },
+    requestHash: { type: String, required: true },
+    responseStatus: { type: Number, required: true },
+    responseBody: { type: Schema.Types.Mixed, required: true },
+    createdAt: { type: Date, default: Date.now },
+    expiresAt: { type: Date, required: true },
+  },
+  {
+    timestamps: false, // We manage createdAt manually for simplicity
+  },
+);
+
+// TTL index on expiresAt (0 seconds means it expires exactly at expiresAt)
+IdempotencyRecordSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+
+export default model<IIdempotencyRecord>("IdempotencyRecord", IdempotencyRecordSchema);

package/index.ts

@@ -60,6 +60,8 @@ export { default as SandboxSnapshot } from "./sandbox-snapshot";
 export { default as SandboxSnapshotUsageSegment } from "./sandbox-snapshot-usage-segment";
 export { default as SandboxUsageSegment } from "./sandbox-usage-segment";
 export { default as VolumeUsageSegment } from "./volume-usage-segment";
+export { default as IdempotencyRecord } from "./idempotency";
+export { StorageBucket, StorageObject, StorageUpload, StorageToken } from "./storage";
 
 export {
   IUser,
@@ -133,6 +135,12 @@ export {
   ISandboxUsageSegmentCosts,
   IVolumeUsageSegment,
   IVolumeUsageSegmentCosts,
+  IIdempotencyRecord,
+  IStorageBucket,
+  IStorageObject,
+  IStorageUpload,
+  IStorageToken,
+  StorageTokenPermission,
 } from "./types";
 export {
   GIT_TYPE,
@@ -173,6 +181,9 @@ export {
   SANDBOX_STATUS,
   SANDBOX_DESTROY_REASON,
   SANDBOX_SNAPSHOT_STATUS,
+  StorageBucketStatus,
+  StorageUploadStatus,
+  StorageTokenStatus,
 } from "./enum";
 
 import mongoose from "mongoose";
@@ -213,7 +224,7 @@ export const healthCheckMongo = async (): Promise<boolean> => {
     if (mongoose.connection.readyState !== 1) {
       return false;
     }
-    await mongoose.connection.db.admin().ping();
+    await mongoose.connection.db?.admin().ping();
     return true;
   } catch (error) {
     log.error(`MongoDB health check failed`, error);

package/logs.ts

@@ -1,7 +1,6 @@
 import { model, Schema } from "mongoose";
 import { ENVIRONMENT, PROJECT_STATUS } from "./enum";
 import { ILog } from "./types";
-import { softDeletePlugin } from "soft-delete-plugin-mongoose";
 
 const LogSchema = new Schema(
   {
@@ -42,6 +41,4 @@ const LogSchema = new Schema(
   { timestamps: true },
 );
 
-LogSchema.plugin(softDeletePlugin);
-
 export default model<ILog>("Log", LogSchema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "3.8.38",
+  "version": "3.8.41",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,8 +12,7 @@
     "@brimble/models": "^3.8.21",
     "@brimble/utils": "^1.5.23",
     "dotenv": "^8.2.0",
-    "mongoose": "^8.2.1",
-    "soft-delete-plugin-mongoose": "^1.0.17",
+    "mongoose": "^9.6.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
@@ -21,7 +20,7 @@
     "@types/uuid": "^8.3.0",
     "nodemon": "^2.0.2",
     "ts-node": "^8.10.2",
-    "typescript": "^4.9.4"
+    "typescript": "^5.9.3"
   },
   "gitHead": "54989906c229a84ccecc57c28ebd8e8dccffd363"
 }

package/plan_configuration.ts

@@ -23,6 +23,7 @@ const PlanConfigurationSchema = new Schema<IPlanConfiguration>(
     unlimited_projects: { type: Boolean, default: false },
     ai_debug_enabled: { type: Boolean, default: false, required: false },
     ai_debug_limit: { type: Number, default: 0, required: false },
+    storage_bucket_enabled: { type: Boolean, default: false },
     plan_type: {
       type: String,
       enum: Object.values(SUBSCRIPTION_PLAN_TYPE),

package/sandbox-snapshot.ts

@@ -1,5 +1,4 @@
 import { model, Schema } from "mongoose";
-import { softDeletePlugin } from "soft-delete-plugin-mongoose";
 import { ISandboxSnapshot } from "./types/sandbox-snapshot";
 import { SANDBOX_SNAPSHOT_STATUS } from "./enum";
 
@@ -53,6 +52,4 @@ const sandboxSnapshotSchema: Schema = new Schema(
   { timestamps: { createdAt: "created_at", updatedAt: "updated_at" } },
 );
 
-sandboxSnapshotSchema.plugin(softDeletePlugin);
-
 export default model<ISandboxSnapshot>("SandboxSnapshot", sandboxSnapshotSchema);

package/storage.ts

@@ -0,0 +1,83 @@
+import { model, Schema } from "mongoose";
+import { StorageBucketStatus, StorageTokenStatus, StorageUploadStatus } from "./enum";
+import { IStorageBucket, IStorageObject, IStorageToken, IStorageUpload } from "./types/storage";
+
+const storageBucketSchema = new Schema(
+  {
+    name: { type: String, required: true, trim: true },
+    project: { type: Schema.Types.ObjectId, ref: "Project", required: false, index: true },
+    user_id: { type: Schema.Types.ObjectId, ref: "User", required: false, index: true },
+    team: { type: Schema.Types.ObjectId, ref: "Team", required: false, index: true },
+    bucket_name: { type: String, required: true, unique: true },
+    is_public: { type: Boolean, default: false },
+    versioning: { type: Boolean, default: false },
+    provider: { type: String, default: "tigris" },
+    region: { type: String, default: "auto" },
+    storage_used: { type: Number, default: 0 },
+    reserved_bytes: { type: Number, default: 0 },
+    quota: { type: Number, required: true },
+    status: { type: String, enum: Object.values(StorageBucketStatus), default: StorageBucketStatus.Active },
+  },
+  { timestamps: true },
+);
+
+storageBucketSchema.index({ user_id: 1, team: 1, name: 1 }, { unique: true, name: "uniq_storage_bucket_owner_name" });
+storageBucketSchema.index({ user_id: 1, updatedAt: -1 }, { name: "idx_storage_bucket_user_updated_at" });
+storageBucketSchema.index({ team: 1, updatedAt: -1 }, { name: "idx_storage_bucket_team_updated_at" });
+
+const storageObjectSchema = new Schema(
+  {
+    bucket: { type: Schema.Types.ObjectId, ref: "StorageBucket", required: true, index: true },
+    project: { type: Schema.Types.ObjectId, ref: "Project", required: false, index: true },
+    key: { type: String, required: true },
+    path: { type: String, required: true },
+    content_type: { type: String },
+    size: { type: Number, default: 0 },
+    etag: { type: String },
+    public_url: { type: String },
+    last_modified: { type: Date },
+  },
+  { timestamps: true },
+);
+
+storageObjectSchema.index({ bucket: 1, key: 1 }, { unique: true, name: "uniq_storage_object_bucket_key" });
+
+const storageUploadSchema = new Schema(
+  {
+    bucket: { type: Schema.Types.ObjectId, ref: "StorageBucket", required: true, index: true },
+    project: { type: Schema.Types.ObjectId, ref: "Project", required: false, index: true },
+    key: { type: String, required: true },
+    path: { type: String, required: true },
+    upload_id: { type: String, index: true },
+    content_type: { type: String },
+    size: { type: Number, required: true },
+    status: { type: String, enum: Object.values(StorageUploadStatus), default: StorageUploadStatus.Pending, index: true },
+    expires_at: { type: Date, required: true, index: true },
+    completed_at: { type: Date },
+  },
+  { timestamps: true },
+);
+
+const storageTokenSchema = new Schema(
+  {
+    name: { type: String, required: true, trim: true },
+    token_hash: { type: String, required: true, unique: true },
+    prefix: { type: String, required: true },
+    project: { type: Schema.Types.ObjectId, ref: "Project", required: false, index: true },
+    buckets: [{ type: Schema.Types.ObjectId, ref: "StorageBucket" }],
+    user_id: { type: Schema.Types.ObjectId, ref: "User", required: false, index: true },
+    team: { type: Schema.Types.ObjectId, ref: "Team", required: false, index: true },
+    permissions: [{ type: String, enum: ["read", "write", "delete", "list", "admin"], required: true }],
+    status: { type: String, enum: Object.values(StorageTokenStatus), default: StorageTokenStatus.Active },
+    last_used_at: { type: Date },
+    expires_at: { type: Date },
+  },
+  { timestamps: true },
+);
+
+storageTokenSchema.index({ project: 1, status: 1 }, { name: "idx_storage_token_project_status" });
+
+export const StorageBucket = model<IStorageBucket>("StorageBucket", storageBucketSchema);
+export const StorageObject = model<IStorageObject>("StorageObject", storageObjectSchema);
+export const StorageUpload = model<IStorageUpload>("StorageUpload", storageUploadSchema);
+export const StorageToken = model<IStorageToken>("StorageToken", storageTokenSchema);

package/types/idempotency.ts

@@ -0,0 +1,12 @@
+import { Document } from "mongoose";
+
+// `Document<string>` makes `_id` a string (the idempotency key / UUID) rather than the default ObjectId.
+export interface IIdempotencyRecord extends Document<string> {
+  _id: string; // The idempotency key (UUID)
+  endpoint: string;
+  requestHash: string;
+  responseStatus: number;
+  responseBody: unknown;
+  createdAt: Date;
+  expiresAt: Date;
+}

package/types/index.ts

@@ -71,3 +71,11 @@ export type {
   IVolumeUsageSegment,
   IVolumeUsageSegmentCosts,
 } from "./volume-usage-segment";
+export type { IIdempotencyRecord } from "./idempotency";
+export type {
+  IStorageBucket,
+  IStorageObject,
+  IStorageUpload,
+  IStorageToken,
+  StorageTokenPermission,
+} from "./storage";

package/types/plan_configuration.ts

@@ -10,7 +10,6 @@ export interface IPlanConfiguration extends Document {
   autoscaling_enabled: boolean;
   concurrent_builds: number;
   project_limit: number;
-  volumes_enabled: boolean;
   deploy_private_organization: boolean;
   preview_comments: boolean;
   password_enabled: boolean;
@@ -23,6 +22,7 @@ export interface IPlanConfiguration extends Document {
   bandwidth: number;
   pull_request_preview: boolean;
   plan_type: SUBSCRIPTION_PLAN_TYPE;
+  volumes_enabled: boolean;
   memory: number;
   build_timeout: number;
   storage: number;
@@ -36,6 +36,7 @@ export interface IPlanConfiguration extends Document {
   webhook_enabled: boolean;
   can_deploy_all_applications: boolean;
   stripe_prices?: Record<string, string>;
+  storage_bucket_enabled: boolean;
   sandbox_max_count: number;
   sanxbox_hours_max: number;
   sandbox_enabled: boolean;

package/types/project/index.ts

@@ -30,7 +30,6 @@ export interface IProject extends Document {
   dir: string;
   tlsEnabled: boolean;
   dbImage: IDbImage;
-  persistent_mount_path: string;
   installCommand: string;
   buildCommand: string;
   startCommand: string;
@@ -96,6 +95,7 @@ export interface IProject extends Document {
   hasUpdates?: boolean;
   whiteListedIps?: string[];
   diskSize?: number;
+  persistent_mount_path?: string;
   volumeMount: string;
   volume: IVolume | null;
 }

package/types/storage.ts

@@ -0,0 +1,67 @@
+import { Document, Types } from "mongoose";
+import { StorageBucketStatus, StorageTokenStatus, StorageUploadStatus } from "../enum";
+
+export type StorageTokenPermission = "read" | "write" | "delete" | "list" | "admin";
+
+export interface IStorageBucket extends Document {
+  name: string;
+  project?: Types.ObjectId;
+  user_id?: Types.ObjectId;
+  team?: Types.ObjectId;
+  bucket_name: string;
+  is_public: boolean;
+  versioning: boolean;
+  provider: string;
+  region: string;
+  storage_used: number;
+  reserved_bytes: number;
+  quota: number;
+  status: StorageBucketStatus;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IStorageObject extends Document {
+  bucket: Types.ObjectId;
+  project?: Types.ObjectId;
+  key: string;
+  path: string;
+  content_type?: string;
+  size: number;
+  etag?: string;
+  public_url?: string;
+  last_modified?: Date;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IStorageUpload extends Document {
+  bucket: Types.ObjectId;
+  project?: Types.ObjectId;
+  key: string;
+  path: string;
+  upload_id?: string;
+  content_type?: string;
+  size: number;
+  status: StorageUploadStatus;
+  expires_at: Date;
+  completed_at?: Date;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IStorageToken extends Document {
+  name: string;
+  token_hash: string;
+  prefix: string;
+  project?: Types.ObjectId;
+  buckets: Types.ObjectId[];
+  user_id?: Types.ObjectId;
+  team?: Types.ObjectId;
+  permissions: StorageTokenPermission[];
+  status: StorageTokenStatus;
+  last_used_at?: Date;
+  expires_at?: Date;
+  createdAt: Date;
+  updatedAt: Date;
+}