speedly 2.0.43 → 2.0.45

package/dist/cjs/configs.default.d.ts

@@ -0,0 +1,36 @@
+import { Request } from "express";
+export interface DefaultConfig {
+    uploader: {
+        saveInDb: boolean;
+        prefix: string;
+        limit: number;
+        format: RegExp;
+        path: string;
+    };
+    db: {
+        dbType: string;
+        path: string;
+        type: 'internal' | 'external';
+        dbEnv: string;
+        first: boolean;
+        response: boolean;
+        pagination: {
+            quantity?: number;
+            detailed?: boolean;
+            [key: string]: unknown;
+        } | false;
+    };
+    auth: {
+        admin: {
+            role: string;
+            model: string;
+        };
+        jwtSecretEnv: string;
+        customValidator: (req: Request, key: string) => (boolean | null) | Promise<boolean | null> | null;
+    };
+    translate: {
+        one_api_token: string;
+    };
+}
+declare const defaultConfigs: DefaultConfig;
+export default defaultConfigs;

package/dist/cjs/configs.default.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const defaultConfigs = {
+    uploader: {
+        saveInDb: false,
+        prefix: "",
+        limit: 5,
+        format: /png|jpg|webp|jpeg/i,
+        path: "../../../public",
+    },
+    db: {
+        dbType: "mongodb",
+        path: "../model",
+        type: "external",
+        dbEnv: "DB_URL",
+        first: false,
+        response: true,
+        pagination: {
+            detailed: true,
+            quantity: 20
+        }
+    },
+    auth: {
+        admin: { role: "ADMIN", model: "../models/admin" },
+        jwtSecretEnv: "JWT_KEY",
+        customValidator: (req, key) => {
+            return true;
+        },
+    },
+    translate: { one_api_token: "" }
+};
+exports.default = defaultConfigs;

package/dist/cjs/kit/auth/auth.js

@@ -4,14 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getConfig_1 = __importDefault(require("../../util/getConfig"));
-const gConfig = {
-    admin: { role: "ADMIN", model: "../models/admin" },
-    jwtSecretEnv: "JWT_KEY",
-    customValidator: (req, key) => {
-        return true;
-    },
-    ...(0, getConfig_1.default)("auth"),
-};
+const gConfig = (0, getConfig_1.default)("auth");
 const executer = (authType) => {
     const mw = async (req, res, next) => {
         const accessResult = await gConfig?.customValidator?.(req, authType);

package/dist/cjs/kit/db/db.d.ts

@@ -1,4 +1,5 @@
 import { Request, Response, NextFunction } from "express";
+import { DefaultConfig } from "../../configs.default";
 declare module "express-serve-static-core" {
     interface Request {
         document?: any;
@@ -9,21 +10,7 @@ declare module "express-serve-static-core" {
         success?: (statusCode: number, body: any) => void;
     }
 }
-type ConfigsType = {
-    dbType?: string;
-    path?: string;
-    dbEnv?: string;
-    response?: boolean;
-    first?: boolean;
-    type: "internal" | "external";
-    pagination?: {
-        quantity?: number;
-        detailed?: boolean;
-        [key: string]: unknown;
-    };
-    [key: string]: unknown;
-};
-declare const db: (collectionName: string, config?: ConfigsType) => {
+declare const db: (collectionName: string, config?: Partial<DefaultConfig["db"]>) => {
     find: (match?: {}) => {
         (req: Request, res: Response, next: NextFunction): Promise<void>;
         select(value: string | {

package/dist/cjs/kit/db/db.js

@@ -9,15 +9,7 @@ const strToObj_1 = __importDefault(require("../../util/strToObj"));
 const getConfig_1 = __importDefault(require("../../util/getConfig"));
 const translator_1 = __importDefault(require("../../util/translator"));
 const utils_1 = require("./utils");
-let configs = {
-    dbType: "mongodb",
-    path: "../models",
-    type: "external",
-    dbEnv: "DB_URL",
-    first: false,
-    response: true,
-    ...(0, getConfig_1.default)("db"),
-};
+let configs = (0, getConfig_1.default)("db");
 const usingMongoDb = (collectionName, config = { type: "external" }) => {
     let model;
     let queryState = {
@@ -207,7 +199,7 @@ const usingMongoDb = (collectionName, config = { type: "external" }) => {
                         },
                     });
             }
-            if (req.query.page && queryState.action !== "aggregate") {
+            if (configs.pagination && req.query.page && queryState.action !== "aggregate") {
                 const pageStr = Array.isArray(req.query.page)
                     ? req.query.page[0]
                     : typeof req.query.page === "string"
@@ -235,7 +227,7 @@ const usingMongoDb = (collectionName, config = { type: "external" }) => {
                         value: limitNum,
                     });
             }
-            else if (req.query.limit && queryState.action !== "aggregate") {
+            else if (configs.pagination && req.query.limit && queryState.action !== "aggregate") {
                 const limitStr = Array.isArray(req.query.limit)
                     ? req.query.limit[0]
                     : typeof req.query.limit === "string"
@@ -278,23 +270,9 @@ const usingMongoDb = (collectionName, config = { type: "external" }) => {
             }
         }
         try {
-            const page = parseInt(Array.isArray(req.query.page)
-                ? String(req.query.page[0])
-                : typeof req.query.page === "string"
-                    ? req.query.page
-                    : "") || 1;
-            const limit = parseInt(Array.isArray(req.query.limit)
-                ? String(req.query.limit[0])
-                : typeof req.query.limit === "string"
-                    ? req.query.limit
-                    : req.query.limit !== undefined
-                        ? String(req.query.limit)
-                        : "") ||
-                configs.pagination?.quantity ||
-                20;
             switch (queryState.action) {
                 case "find":
-                    if (configs.pagination?.detailed && req.query.page) {
+                    if (configs.pagination && configs.pagination?.detailed && req.query.page) {
                         const page = parseInt(Array.isArray(req.query.page)
                             ? String(req.query.page[0])
                             : typeof req.query.page === "string"
@@ -372,7 +350,7 @@ const usingMongoDb = (collectionName, config = { type: "external" }) => {
                     data = model?.[queryState.action]?.call(model, queryState.id || req.params.id);
                     break;
                 case "aggregate":
-                    if (configs.pagination?.detailed && req.query.page) {
+                    if (configs.pagination && configs.pagination?.detailed && req.query.page) {
                         const page = parseInt(req.query.page) || 1;
                         const limit = parseInt(req.query.limit) ||
                             configs.pagination?.quantity ||
@@ -607,17 +585,10 @@ const usingMongoDb = (collectionName, config = { type: "external" }) => {
 //   return chainActions;
 // };
 const db = (collectionName, config = configs) => {
-    let generatedConfig = {
-        dbType: "mongodb",
-        path: "../models",
-        dbEnv: "DB_URL",
-        type: "external",
-        first: false,
-        response: true,
-        ...(0, getConfig_1.default)("db"),
-    };
+    let generatedConfig = (0, getConfig_1.default)("db");
     Object.entries(config).forEach(([key, value]) => {
-        generatedConfig[key] = value;
+        if (key in generatedConfig)
+            generatedConfig[key] = value;
     });
     switch (generatedConfig.dbType) {
         case "mongodb":

package/dist/cjs/kit/uploader/uploader.d.ts

@@ -8,7 +8,6 @@ declare global {
     }
 }
 declare const _default: (destination: string | ((req: Request, file: Express.Multer.File) => string) | undefined, filename: string | ((req: Request, file: Express.Multer.File) => string), config?: {
-    [key: string]: any;
     saveInDb: boolean;
     prefix: string;
     limit: number;

package/dist/cjs/kit/uploader/uploader.js

@@ -8,19 +8,13 @@ const fs_1 = __importDefault(require("fs"));
 const multer_1 = __importDefault(require("multer"));
 const mongoose_1 = __importDefault(require("mongoose"));
 const getConfig_1 = __importDefault(require("../../util/getConfig"));
-let configs = {
-    saveInDb: false,
-    prefix: "",
-    limit: 5,
-    format: /png|jpg|webp|jpeg/i,
-    path: "../../../public",
-    ...(0, getConfig_1.default)("uploader"),
-};
+let configs = (0, getConfig_1.default)("uploader");
 exports.default = (destination = "/image", filename, config = configs) => {
     let dest;
     try {
         Object.entries(config).forEach(([key, val]) => {
-            configs[key] = val;
+            if (key in configs)
+                configs[key] = val;
         });
         const storage = multer_1.default.diskStorage({
             destination: function (req, file, cb) {

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

@@ -0,0 +1,2 @@
+import yup from "yup";
+export default yup;

package/dist/cjs/types/index.js

@@ -0,0 +1,155 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getConfig_1 = __importDefault(require("../util/getConfig"));
+const configs = {
+    model: (0, getConfig_1.default)('db'),
+    uploader: (0, getConfig_1.default)('uploader')
+};
+const mongoose_1 = require("mongoose");
+const importFromPwd_1 = __importDefault(require("../util/importFromPwd"));
+const path_1 = __importDefault(require("path"));
+const media = (0, importFromPwd_1.default)(path_1.default.join("..", "model", "media"));
+const yup_1 = __importDefault(require("yup"));
+const fs_1 = __importDefault(require("fs"));
+const lodash_1 = __importDefault(require("lodash"));
+const types = {
+    file: {
+        min: 0,
+        max: Infinity,
+        validFormat: /.+/,
+    },
+    image: {
+        min: 0,
+        max: Infinity,
+        validFormat: /.+/,
+    },
+    video: {
+        min: 0,
+        max: Infinity,
+        validFormat: /.+/,
+    },
+    audio: {
+        min: 0,
+        max: Infinity,
+        validFormat: /.+/,
+    },
+    element: {
+        min: 0,
+        max: Infinity,
+        validFormat: /.+/,
+    },
+};
+// Add a global method for strings to ensure they are valid ObjectIds
+yup_1.default.addMethod(yup_1.default.string, "oid", function (errorMessage = "آیدی درست نیست") {
+    return this.test({
+        name: "oid",
+        message: errorMessage,
+        test(value) {
+            if (!value)
+                return true;
+            if (value == "$$REMOVE")
+                return true;
+            if (!value || !(0, mongoose_1.isValidObjectId)(value)) {
+                return false; // Invalid ObjectId
+            }
+            return true; // Valid ObjectId
+        },
+    });
+});
+yup_1.default.addMethod(yup_1.default.string, "media", function (type = "image") {
+    return this.test("media", "invalid media file", async function (value) {
+        const { path, createError } = this;
+        if (!value)
+            return true;
+        if (value == "$$REMOVE")
+            return true;
+        if (!(0, mongoose_1.isValidObjectId)(value))
+            return createError({ path, message: "file id is invalid" });
+        const mediaDoc = await media.findById(value);
+        if (mediaDoc.type !== type)
+            return createError({ path, message: `file type must be ${type}` });
+        return true;
+    });
+});
+yup_1.default.addMethod(yup_1.default.array, "media", function (typeSchema = { ...types }) {
+    let mediaSchema;
+    return this.transform((value) => {
+        return value?.map((item) => {
+            if (item._id)
+                return item._id.toObjectId();
+            return item;
+        });
+    }).test("media", "Invalid media files", async function (value) {
+        mediaSchema = lodash_1.default.cloneDeep(typeSchema);
+        const { path, createError } = this;
+        let mediaDocs = [];
+        let i = 1;
+        if (!value)
+            return true;
+        for (let mediaId of value) {
+            if (mediaId?._id)
+                mediaId = mediaId._id;
+            if (!(0, mongoose_1.isValidObjectId)(mediaId))
+                return createError({ path, message: `file ${i} id is invalid` });
+            const mediaDoc = await media.findById(mediaId);
+            if (!mediaDoc)
+                return createError({
+                    path,
+                    message: `file ${i} does'nt exist in database`,
+                });
+            if (!fs_1.default.existsSync(path_1.default.join(__dirname, configs.uploader.path, mediaDoc.dirPath, mediaDoc.name)) && mediaDoc.type != 'script')
+                return createError({
+                    path,
+                    message: `file ${i} does'nt exist in files`,
+                });
+            mediaDocs.push(mediaDoc);
+            i++;
+        }
+        i = 1;
+        let mediaType;
+        const mediaTypes = ["audio", "video", "script", "image"];
+        if (mediaSchema?.max < mediaDocs.length)
+            return createError({
+                path,
+                message: `media : ${mediaType} is more than maximum ${mediaSchema?.max}`,
+            });
+        if (mediaSchema?.min > mediaDocs.length)
+            return createError({
+                path,
+                message: `media : ${mediaType} is less than minimum ${mediaSchema?.min}`,
+            });
+        for (const mediaDoc of mediaDocs) {
+            mediaType = mediaTypes.find((mt) => mt == mediaDoc.type) || "file";
+            console.log("yup.config", 99, !mediaSchema[mediaType]);
+            if (!mediaSchema[mediaType])
+                return createError({ path, message: `file ${i} type forbidden` });
+            if (mediaSchema[mediaType].validFormat &&
+                !mediaSchema[mediaType].validFormat.test(mediaDoc.name.split(".").slice(-1)[0]))
+                return createError({ path, message: `file ${i} have invalid format` });
+            if (mediaSchema.typeOrder && mediaSchema.typeOrder[i] && !mediaDoc.type.match(mediaSchema.typeOrder[i]))
+                mediaSchema[mediaType].values = mediaSchema[mediaType].values
+                    ? [...mediaSchema[mediaType].values, mediaDoc]
+                    : [mediaDoc];
+            i++;
+        }
+        let typeObj;
+        for (const typeField in mediaSchema) {
+            typeObj = mediaSchema[typeField];
+            if (typeObj.min && typeObj.min > (mediaDocs.filter(item => item.type == typeField).length || 0))
+                return createError({
+                    path,
+                    message: `media : ${typeField} is less than minimum ${typeObj.min}`,
+                });
+            if (typeObj.max && typeObj.max < (mediaDocs.filter(item => item.type == typeField).length || 0))
+                return createError({
+                    path,
+                    message: `media : ${typeField} is more than maximum ${typeObj.max}`,
+                });
+        }
+        return true;
+    });
+});
+exports.default = yup_1.default;

package/dist/cjs/util/getConfig.d.ts

@@ -1,4 +1,3 @@
-declare const configGetter: (configField: string) => {
-    [key: string]: unknown;
-};
+import { DefaultConfig } from "../configs.default";
+declare const configGetter: <Z extends keyof DefaultConfig>(configField: Z) => DefaultConfig[Z];
 export default configGetter;

package/dist/cjs/util/getConfig.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const configs_default_1 = __importDefault(require("../configs.default"));
 const find = (field, ...args) => {
     const rel = path_1.default.join.apply(null, [].slice.call(args));
     if (!require?.main?.filename)
@@ -33,8 +34,19 @@ const findStartingWith = (start, rel, field) => {
 };
 const configGetter = (configField) => {
     const foundData = find(configField, "speedly.config");
-    if (foundData)
-        return foundData;
-    return {};
+    let configValue = {};
+    if (configs_default_1.default[configField] &&
+        Object.entries(configs_default_1.default[configField]).length) {
+        configValue = {
+            ...configs_default_1.default[configField]
+        };
+    }
+    if (foundData) {
+        configValue = {
+            ...configValue,
+            ...foundData
+        };
+    }
+    return configValue;
 };
 exports.default = configGetter;

package/dist/cjs/util/importFromPwd.d.ts

@@ -0,0 +1 @@
+export default function importFromPwd(path: string): any;

package/dist/cjs/util/importFromPwd.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = importFromPwd;
+const path_1 = __importDefault(require("path"));
+function importFromPwd(path) {
+    if (!require?.main?.filename)
+        return null;
+    const mainDir = path_1.default.dirname(require.main.filename);
+    const fullPath = path_1.default.join(mainDir, path);
+    try {
+        return require(fullPath);
+    }
+    catch (err) {
+        if (err instanceof Error && "code" in err && err.code === "ENOENT") {
+            throw new Error(`File ${fullPath} doesn't exist`);
+        }
+        throw err;
+    }
+}

package/dist/cjs/util/index.d.ts

@@ -1,2 +1,4 @@
 import translator from "./translator";
-export { translator };
+import makeOptional from "./makeOptional";
+import strToObj from "./strToObj";
+export { translator, strToObj, makeOptional };

package/dist/cjs/util/index.js

@@ -3,6 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translator = void 0;
+exports.makeOptional = exports.strToObj = exports.translator = void 0;
 const translator_1 = __importDefault(require("./translator"));
 exports.translator = translator_1.default;
+const makeOptional_1 = __importDefault(require("./makeOptional"));
+exports.makeOptional = makeOptional_1.default;
+const strToObj_1 = __importDefault(require("./strToObj"));
+exports.strToObj = strToObj_1.default;

package/dist/cjs/util/translator.js

@@ -7,7 +7,7 @@ const axios_1 = __importDefault(require("axios"));
 const translation_1 = __importDefault(require("./../model/translation"));
 const TIMEOUT = 5000;
 const getConfig_1 = __importDefault(require("./getConfig"));
-const configs = { ...(0, getConfig_1.default)("translate") };
+const configs = (0, getConfig_1.default)("translate");
 async function firstSuccessful(promises) {
     return new Promise((resolve, reject) => {
         let rejections = 0;
@@ -48,7 +48,7 @@ exports.default = async (text = "unspecified text", lang = "fa") => {
         }, {
             timeout: TIMEOUT,
             headers: {
-                "one-api-token": "783122:68a02b5c4dcee",
+                "one-api-token": configs.one_api_token,
             },
         });
         if (res.data.status === 200) {

package/dist/esm/configs.default.d.ts

@@ -0,0 +1,36 @@
+import { Request } from "express";
+export interface DefaultConfig {
+    uploader: {
+        saveInDb: boolean;
+        prefix: string;
+        limit: number;
+        format: RegExp;
+        path: string;
+    };
+    db: {
+        dbType: string;
+        path: string;
+        type: 'internal' | 'external';
+        dbEnv: string;
+        first: boolean;
+        response: boolean;
+        pagination: {
+            quantity?: number;
+            detailed?: boolean;
+            [key: string]: unknown;
+        } | false;
+    };
+    auth: {
+        admin: {
+            role: string;
+            model: string;
+        };
+        jwtSecretEnv: string;
+        customValidator: (req: Request, key: string) => (boolean | null) | Promise<boolean | null> | null;
+    };
+    translate: {
+        one_api_token: string;
+    };
+}
+declare const defaultConfigs: DefaultConfig;
+export default defaultConfigs;

package/dist/esm/configs.default.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const defaultConfigs = {
+    uploader: {
+        saveInDb: false,
+        prefix: "",
+        limit: 5,
+        format: /png|jpg|webp|jpeg/i,
+        path: "../../../public",
+    },
+    db: {
+        dbType: "mongodb",
+        path: "../model",
+        type: "external",
+        dbEnv: "DB_URL",
+        first: false,
+        response: true,
+        pagination: {
+            detailed: true,
+            quantity: 20
+        }
+    },
+    auth: {
+        admin: { role: "ADMIN", model: "../models/admin" },
+        jwtSecretEnv: "JWT_KEY",
+        customValidator: (req, key) => {
+            return true;
+        },
+    },
+    translate: { one_api_token: "" }
+};
+exports.default = defaultConfigs;

package/dist/esm/kit/auth/auth.js

@@ -4,14 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getConfig_1 = __importDefault(require("../../util/getConfig"));
-const gConfig = {
-    admin: { role: "ADMIN", model: "../models/admin" },
-    jwtSecretEnv: "JWT_KEY",
-    customValidator: (req, key) => {
-        return true;
-    },
-    ...(0, getConfig_1.default)("auth"),
-};
+const gConfig = (0, getConfig_1.default)("auth");
 const executer = (authType) => {
     const mw = async (req, res, next) => {
         const accessResult = await gConfig?.customValidator?.(req, authType);

package/dist/esm/kit/db/db.d.ts

@@ -1,4 +1,5 @@
 import { Request, Response, NextFunction } from "express";
+import { DefaultConfig } from "../../configs.default";
 declare module "express-serve-static-core" {
     interface Request {
         document?: any;
@@ -9,21 +10,7 @@ declare module "express-serve-static-core" {
         success?: (statusCode: number, body: any) => void;
     }
 }
-type ConfigsType = {
-    dbType?: string;
-    path?: string;
-    dbEnv?: string;
-    response?: boolean;
-    first?: boolean;
-    type: "internal" | "external";
-    pagination?: {
-        quantity?: number;
-        detailed?: boolean;
-        [key: string]: unknown;
-    };
-    [key: string]: unknown;
-};
-declare const db: (collectionName: string, config?: ConfigsType) => {
+declare const db: (collectionName: string, config?: Partial<DefaultConfig["db"]>) => {
     find: (match?: {}) => {
         (req: Request, res: Response, next: NextFunction): Promise<void>;
         select(value: string | {