pangea-server 3.3.93 → 3.3.95

package/dist/auth/auth.helpers.d.ts

@@ -10,7 +10,7 @@ export declare function validateAccessToken(authHeader: AuthHeader, db: Db, acce
     accessToken: string;
     user: ModelInstance<User>;
 }>;
-export declare function getUserFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<User | null> | null;
+export declare function getUserFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<ModelInstance<User> | null> | null;
 export declare function getUsersFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, authMap: AuthMap): Promise<{
     [k: string]: ModelInstance<User> | null;
 }>;

package/dist/database/db-client.js

@@ -17,7 +17,8 @@ function initDatabase(models, seeds, config = {}) {
         username: (0, helpers_1.getEnvStr)('DB_USERNAME'),
         password: (0, helpers_1.getEnvStr)('DB_PASSWORD'),
         database: (0, helpers_1.getEnvStr)('DB_DATABASE'),
-        pool: { max: 10, min: 2, idle: 30000, acquire: 60000 },
+        pool: { max: 5, min: 0, acquire: 30000, idle: 15000, evict: 5000 },
+        timezone: '+00:00',
         models: Object.values(models),
         logging: config.logging ? logQuery : false,
         benchmark: true,

package/dist/database/db.class.d.ts

@@ -36,31 +36,31 @@ type AggregateManyOptions<BM extends BaseModel> = Omit<FindManyOptions<BM>, 'ord
 export declare class Db {
     private __tx?;
     constructor(tx: Tx);
-    findOneOrNull<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<BM | null>;
-    findOne<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<BM>;
+    findOneOrNull<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<ModelInstance<BM> | null>;
+    findOne<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<ModelInstance<BM>>;
     aggregateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, attributes: Attributes, options?: AggregateOneOptions<BM>): Promise<unknown>;
     private __getFindOneBaseOptions;
-    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<BM[]>;
+    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<ModelInstance<BM>[]>;
     count<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyOptions<BM>): Promise<number>;
     findManyWithCount<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<{
-        instances: BM[];
+        instances: ModelInstance<BM>[];
         totalCount: number;
     }>;
     aggregateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, config: AggregateManyConfig, options?: AggregateManyOptions<BM>): Promise<unknown[]>;
     private __getFindManyBaseOptions;
-    insertOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: InsertParams<BM>): Promise<BM>;
+    insertOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: InsertParams<BM>): Promise<ModelInstance<BM>>;
     insertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, data: InsertParams<BM>[]): Promise<number>;
     upsertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, fieldsToUpdate: (keyof BM)[], data: InsertParams<BM>[]): Promise<number>;
     updateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: UpdateParamsWithId<BM>): Promise<ModelInstance<BM>>;
     updateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId, params: UpdateParams<BM>): Promise<ModelInstance<BM>>;
     updateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>, params: UpdateParams<BM>): Promise<number>;
-    deleteOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<BM | null>;
+    deleteOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<ModelInstance<BM> | null>;
     deleteMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<number>;
-    destroyOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<BM | null>;
+    destroyOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<ModelInstance<BM> | null>;
     destroyMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<number>;
     private __deleteOne;
     private __deleteMany;
-    restoreOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<BM>;
+    restoreOne<BM extends BaseModel>(model: BaseModelCtor<BM>, id: ModelId): Promise<ModelInstance<BM>>;
     restoreMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<void>;
     query(sql: string | {
         query: string;

package/dist/database/db.class.js

@@ -317,7 +317,7 @@ function processInstance(model, instance) {
             processInstance(relModel, relInstance);
         }
     }
-    return instance;
+    return instance.toJSON();
 }
 function processInstances(model, instances) {
     return instances.map((instance) => processInstance(model, instance));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.3.93",
+  "version": "3.3.95",
   "files": [
     "dist"
   ],