speedly 2.0.38 → 2.0.42

package/dist/util/makeOptional.js

@@ -0,0 +1,47 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const yup = __importStar(require("yup"));
+function default_1(schema) {
+    if (schema.fields) {
+        const shape = {};
+        for (const key in schema.fields) {
+            shape[key] = schema.fields[key].optional();
+        }
+        return yup.object().shape(shape);
+    }
+    return schema;
+}

package/dist/util/strToObj.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (value: string, falseValue?: number, splitValue?: string) => {};
+export default _default;

package/dist/util/strToObj.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (value, falseValue = -1, splitValue = ' ') => {
+    return value.split(splitValue).reduce((prev, curr) => {
+        if (curr[0] == '-')
+            return { ...prev, [curr.slice(1)]: falseValue };
+        return { ...prev, [curr]: 1 };
+    }, {});
+};

package/dist/util/translator.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (text?: string, lang?: string) => Promise<unknown>;
+export default _default;

package/dist/util/translator.js

@@ -0,0 +1,74 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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") };
+async function firstSuccessful(promises) {
+    return new Promise((resolve, reject) => {
+        let rejections = 0;
+        const total = promises.length;
+        promises.forEach((p) => {
+            Promise.resolve(p)
+                .then(resolve)
+                .catch(() => {
+                rejections++;
+                if (rejections === total) {
+                    reject(new Error("همه ترجمه‌ها شکست خوردند"));
+                }
+            });
+        });
+    });
+}
+exports.default = async (text = "unspecified text", lang = "fa") => {
+    const formattedText = text
+        .replaceAll(/[\-\_]/g, " ")
+        .replaceAll(/[A-Z]/g, " $&");
+    const translationDoc = await translation_1.default.findOne({
+        text: formattedText,
+        lang,
+    });
+    if (translationDoc)
+        return translationDoc.translatedText;
+    const translationPromises = [];
+    translationPromises.push((async () => {
+        const res = await axios_1.default.get(`https://655.mtis.workers.dev/translate?text=${encodeURIComponent(formattedText)}&source_lang=en&target_lang=${lang}`, { timeout: TIMEOUT });
+        if (!res.data?.response?.translated_text)
+            throw new Error("Translation failed");
+        return res.data.response.translated_text;
+    })());
+    translationPromises.push((async () => {
+        const res = await axios_1.default.post("https://api.one-api.ir/translate/v1/microsoft", {
+            text: formattedText,
+            target: lang,
+        }, {
+            timeout: TIMEOUT,
+            headers: {
+                "one-api-token": "783122:68a02b5c4dcee",
+            },
+        });
+        if (res.data.status === 200) {
+            return res.data.result;
+        }
+        else {
+            throw new Error(res.data.message);
+        }
+    })());
+    try {
+        const result = await firstSuccessful(translationPromises);
+        await translation_1.default.create({
+            text: formattedText,
+            lang,
+            translatedText: result,
+        });
+        return result;
+    }
+    catch (err) {
+        console.error("translator error:", err);
+        return formattedText;
+    }
+};

package/examples/blog-routes/blog/blog.routes.js

@@ -0,0 +1,15 @@
+const express = require('express');
+const { auth, db, validator } = require('speedly/kit');
+
+const v = require('./blog.validator');
+
+const router = express.Router();
+
+router.route('/').get(db('blog').find().populate([{ path: 'author_id', select: '-password -phone' }, 'thumbnail_id']))
+    .post(auth.admin(), validator(v.post), db('blog').create(req => ({ author_id: req.user._id })))
+
+router.get('/:slug', db('blog').findOneAndUpdate(req => ({ slug: req.params.slug }, { $inc: { views: 1 } })).populate([{ path: 'author_id', select: '-password -phone' }, 'thumbnail_id']))
+router.route('/:id').put(auth.admin(), validator(v.put), db('blog').findByIdAndUpdate())
+    .delete(auth.admin(), validator(v.delete), db('blog').findByIdAndDelete())
+
+module.exports = router;

package/examples/blog-routes/blog/blog.validator.js

@@ -0,0 +1,35 @@
+const makeOptional = require("../../util/makeOptional");
+const { string, object,array, lazy,number } = require("../../yup.config");
+
+const paramId = object({
+  id: string().required('id is required').oid('id is invalid')
+})
+
+const schema = object({
+ title :string().required(),
+  slug : string().required().matches(/[\d\w]+/i ,'slug can contain english letter or numbers and dash'),
+  subTitle : string(),
+  category_id : string().oid(),
+  thumbnail_id : array().media({image: {max : 1}}),
+  content : string(),
+  tag_ids : array(string().oid()),
+  status : string().oneOf(['draft', 'published', 'hidden']),
+  priority : number()
+})
+
+//? exports
+
+exports.post = {
+body: lazy(value =>
+Array.isArray(value)
+? array().of(schema)
+: schema
+)
+}
+exports.put ={
+  params: paramId,
+  body : makeOptional(schema)
+}
+exports.delete = {
+  params : paramId
+}

package/examples/blog-routes/role/role.routes.js

@@ -0,0 +1,14 @@
+const express = require('express');
+const { auth, db, validator } = require('speedly/kit');
+
+const v = require('./role.validator');
+
+const router = express.Router();
+
+router.route('/').get(auth.admin({ permission: 'OWNER' }), db('role').find())
+    .post(auth.admin({ permission: 'OWNER' }), validator(v.post), db('role').create())
+
+router.route('/:id').put(auth.admin({ permission: 'OWNER' }), validator(v.put), db('role').findByIdAndUpdate())
+    .delete(auth.admin({ permission: 'OWNER' }), validator(v.delete), db('role').findByIdAndDelete())
+
+module.exports = router;

package/examples/blog-routes/role/role.validator.js

@@ -0,0 +1,28 @@
+const makeOptional = require("../../util/makeOptional");
+const { string, object, array, lazy, boolean } = require("../../yup.config");
+
+const paramId = object({
+    id: string().required('id is required').oid('id is invalid')
+})
+
+const schema = object({
+    title: string().required('title is required'),
+    access: string().required('access is required').oneOf(['OWNER', 'ADMIN', 'EXPERT'], 'access must be one of OWNER, ADMIN, EXPERT')
+})
+
+//? exports
+
+exports.post = {
+    body: lazy(value =>
+        Array.isArray(value)
+            ? array().of(schema)
+            : schema
+    )
+}
+exports.put = {
+    params: paramId,
+    body: makeOptional(schema)
+}
+exports.delete = {
+    params: paramId
+}

package/examples/blog-routes/user/user.controller.js

@@ -0,0 +1,97 @@
+const userModel = require("../../model/user");
+const otpModel = require("../../model/otp");
+const roleModel = require("../../model/role");
+const bcrypt = require("bcrypt");
+const jwt = require("jsonwebtoken");
+const { randomNumber } = require("../../util/generator");
+const sms = require("../../util/sms");
+const otpSender = async (phone) => {
+  let otpDoc = await otpModel.findOne({ phone });
+  try {
+    if (!otpDoc)
+      otpDoc = await otpModel.create({ phone, code: randomNumber(5) });
+    console.log("user.controller", 10, otpDoc);
+    await sms.otp(phone, "809162", otpDoc.code);
+  } catch (err) {
+    console.error("OTP sending failed:", err.cause?.response?.data?.meta?.errors || err);
+    //! DEVELOPE MODE
+    err.otpDoc = otpDoc
+    //! END DEVELOPE
+    throw err;
+  }
+  return otpDoc;
+};
+
+exports.checkPhone = async (req, res) => {
+  const { phone } = req.body;
+
+  const userDoc = await userModel.findOne({ phone });
+
+  const resBody = {
+    type: userDoc ? "login-otp" : "register",
+  };
+  try {
+    if (req.body.type == 'login-otp' || !userDoc || !userDoc.password) {
+      //! DEVELOPE MODE
+      resBody.IMPORTANT = '⚠ OTP is included in the response in development mode only. Must be removed before production release.'
+      //! END DEVELOPE
+
+      const otpRes = await otpSender(phone);
+
+      resBody.expireAt = otpRes.expireAt;
+
+      console.log('user.controller', 37,);
+
+      if (userDoc && !userDoc.password) {
+        resBody.type = "login-otp";
+      }
+    } else {
+      resBody.type = "login-password";
+    }
+
+    return res.json({ ...resBody, message: "OTP sent successfully" });
+  } catch (err) {
+    //! DEVELOPE MODE
+    if (err.otpDoc) resBody.code = err.otpDoc.code
+    //! END DEVELOPE
+
+    return res.status(err.statusCode || 500).json({ ...resBody, message: "OTP sending failed: " + err.message, });
+
+  }
+};
+exports.register = async (req, res) => {
+  const { phone, otpCode } = req.body;
+  let userDoc = await userModel.findOne({ phone });
+  let type = req.body.type || userDoc ? userDoc.password ? 'login-password' : "login-otp" : "register";
+  if (type === "register" || type === "login-otp") {
+    const otpDoc = await otpModel.findOne({ phone, code: otpCode });
+    if (!otpDoc) return res.status(400).json({ message: "Invalid OTP code" });
+    if (type === "register") {
+      let userObj = { phone };
+      if ((await userModel.countDocuments()) == 0) {
+        const ownerRole =
+          (await roleModel.findOne({ access: "OWNER" })) ||
+          (await roleModel.create({ title: "Owner", access: "OWNER" }));
+        userObj.role_id = ownerRole._id;
+      }
+      userDoc = await userModel.create(userObj);
+    }
+  }
+  else if (type === "login-password") {
+    const { password } = req.body;
+    userDoc = await userModel.findOne({ phone });
+    if (!userDoc) return res.status(400).json({ message: "User not found" });
+    if (!userDoc.password) return res.status(400).json({ message: "Password not set for this user" });
+    if (bcrypt.compareSync(password, userDoc.password)) {
+      return res.status(400).json({ message: "Incorrect password" })
+    }
+  } else {
+    return res.status(400).json({ message: "Invalid type" });
+  }
+  const token = jwt.sign({ id: userDoc._id, }, process.env.JWT_SECRET);
+  res.setCookie("accessToken", token)
+  res.json({
+    message: "Authentication successful",
+    token,
+  });
+}

package/examples/blog-routes/user/user.routes.js

@@ -0,0 +1,18 @@
+const express = require('express');
+const { auth, db, validator } = require('speedly/kit');
+
+const v = require('./user.validator');
+const c = require('./user.controller');
+const router = express.Router();
+
+router.route('/check-phone').post(validator(v.checkPhone), c.checkPhone)
+router.route('/register').post(validator(v.register), c.register)
+router.route('/me').get(auth.user(), db('user').findOne(req => ({ _id: req.user._id })).populate('role_id').select('-password'))
+router.route('/').get(auth.admin({ permission: 'owner' }), db('user').find())
+    .post(auth.admin(), validator(v.post), db('user').create())
+
+
+router.route('/:id').put(auth.admin(), validator(v.put), db('user').findByIdAndUpdate())
+    .delete(auth.admin(), validator(v.delete), db('user').findByIdAndDelete())
+
+module.exports = router;

package/examples/blog-routes/user/user.validator.js

@@ -0,0 +1,53 @@
+const makeOptional = require("../../util/makeOptional");
+const { string, object, array, lazy } = require("../../yup.config");
+
+const paramId = object({
+  id: string().required("id is required").oid("id is invalid"),
+});
+
+const schema = object({});
+
+//? exports
+
+exports.register = {
+  body: object({
+    phone: string()
+      .required("phone is required")
+      .matches(
+        /^09\d{9}$/,
+        "phone is invalid enter 11 digit in format 09*********",
+      ),
+    otpCode: string().when("type", ([type]) => {
+      if (type === "register" || type === "login")
+        return string().required(
+          "otpCode is required for register and login type",
+        );
+    }),
+    password: string().when("type", ([type]) => {
+      if (type === "login-password")
+        return string()
+          .required("password is required for login-password type")
+    }),
+  }),
+};
+
+exports.checkPhone = {
+  body: object({
+    phone: string()
+      .required("phone is required")
+      .matches(
+        /^09\d{9}$/,
+        "phone is invalid enter 11 digit in format 09*********",
+      ),
+  }),
+};
+exports.post = {
+  body: lazy((value) => (Array.isArray(value) ? array().of(schema) : schema)),
+};
+exports.put = {
+  params: paramId,
+  body: makeOptional(schema),
+};
+exports.delete = {
+  params: paramId,
+};

package/package.json

@@ -1,66 +1,65 @@
-{
-  "name": "speedly",
-  "version": "2.0.38",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js"
-    },
-    "./kit": {
-      "import": "./dist/esm/kit/index.js",
-      "require": "./dist/cjs/kit/index.js"
-    },
-    "./util": {
-      "import": "./dist/esm/util/index.js",
-      "require": "./dist/cjs/util/index.js"
-    },
-    "./modules": {
-      "import": "./dist/esm/modules/index.js",
-      "require": "./dist/cjs/modules/index.js"
-    },
-    "./document": {
-      "import": "./dist/esm/document/index.js",
-      "require": "./dist/cjs/document/index.js"
-    },
-    "./model": {
-      "import": "./dist/esm/model/index.js",
-      "require": "./dist/cjs/model/index.js"
-    }
-  },
-  "scripts": {
-    "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
-    "pub": "npm run build && git add . && git commit -m 'publish' && npm version patch && npm publish ",
-    "dev": "ts-node src/index.ts"
-  },
-  "author": "MAHSERIN",
-  "license": "MIT",
-  "description": "",
-  "devDependencies": {
-    "@types/express": "^5.0.3",
-    "@types/multer": "^2.0.0",
-    "@types/node": "^24.5.2",
-    "@types/swagger-ui-express": "^4.1.8",
-    "ts-node": "^10.9.2",
-    "tsc": "^2.0.4",
-    "typescript": "^5.9.3"
-  },
-  "peerDependencies": {
-    "express": "^5",
-    "mongoose": ">=8 <10",
-    "multer": "^2"
-  },
-  "dependencies": {
-    "axios": "^1.11.0",
-    "cosmiconfig": "^9.0.0",
-    "jsonwebtoken": "^9.0.2",
-    "swagger-themes": "^1.4.3",
-    "swagger-ui-express": "^5.0.1",
-    "translate": "^3.0.1",
-    "yup": "^1.7.1"
-  }
-}
+{
+  "name": "speedly",
+  "version": "2.0.42",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    },
+    "./kit": {
+      "import": "./dist/esm/kit/index.js",
+      "require": "./dist/cjs/kit/index.js"
+    },
+    "./util": {
+      "import": "./dist/esm/util/index.js",
+      "require": "./dist/cjs/util/index.js"
+    },
+    "./modules": {
+      "import": "./dist/esm/modules/index.js",
+      "require": "./dist/cjs/modules/index.js"
+    },
+    "./document": {
+      "import": "./dist/esm/document/index.js",
+      "require": "./dist/cjs/document/index.js"
+    },
+    "./model": {
+      "import": "./dist/esm/model/index.js",
+      "require": "./dist/cjs/model/index.js"
+    }
+  },
+  "scripts": {
+    "build": "npm run build:cjs && npm run build:esm",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:esm": "tsc -p tsconfig.esm.json",
+    "pub": "npm run build && git add . && git commit -m 'publish' && npm version patch && npm publish ",
+    "dev": "ts-node src/index.ts"
+  },
+  "author": "MAHSERIN",
+  "license": "MIT",
+  "description": "",
+  "devDependencies": {
+    "@types/express": "^5.0.3",
+    "@types/multer": "^2.0.0",
+    "@types/node": "^24.5.2",
+    "@types/swagger-ui-express": "^4.1.8",
+    "ts-node": "^10.9.2"
+  },
+  "peerDependencies": {
+    "express": "^5",
+    "mongoose": ">=8 <10",
+    "multer": "^2"
+  },
+  "dependencies": {
+    "axios": "^1.11.0",
+    "cosmiconfig": "^9.0.0",
+    "jsonwebtoken": "^9.0.2",
+    "swagger-themes": "^1.4.3",
+    "swagger-ui-express": "^5.0.1",
+    "translate": "^3.0.1",
+    "typescript": "^6.0.3",
+    "yup": "^1.7.1"
+  }
+}

package/dist/cjs/auth/auth2.d.ts

@@ -1,18 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-type Handler = (req: Request, res: Response, next: (errorMessage?: string) => unknown) => unknown;
-type UseAuth = (req: Request, res: Response, next: NextFunction) => UseAuth | {
-    user?: (...handlers: Handler[]) => unknown;
-    admin?: (...handlers: [{
-        permission: string;
-    }, ...Handler[]] | Handler[]) => unknown;
-    any?: (...handlers: Handler[]) => unknown;
-};
-declare const auth: (config?: {
-    admin: {
-        role: string;
-        model: string;
-    };
-    jwtSecretEnv: string;
-    customValidator: (req: Request, key: string) => boolean;
-}) => UseAuth;
-export default auth;

package/dist/cjs/auth/auth2.js

@@ -1,93 +0,0 @@
-"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 gConfig = {
-    admin: { role: "ADMIN", model: "../models/admin" },
-    jwtSecretEnv: "JWT_KEY",
-    customValidator: (req, key) => {
-        return true;
-    },
-    ...(0, getConfig_1.default)("auth"),
-};
-const holders = {};
-const auth = (config = gConfig) => {
-    // const adminModel = require('../models/admin')
-    let handlerState = {};
-    let useAuth = async (req, res, next) => {
-        try {
-            const nextFunc = (handlers, index = 0) => (errorMessage = "") => {
-                if (errorMessage)
-                    return next(errorMessage);
-                if (!handlers.length || !handlers[index + 1])
-                    return next();
-                handlers[index + 1](req, res, nextFunc(handlers, index + 1));
-            };
-            const keys = Object.keys(handlerState);
-            for (let i = 0; i < keys.length; i++) {
-                const key = keys[i];
-                if (!handlerState[key]?.handlers?.length)
-                    continue;
-                if (await gConfig?.customValidator?.(req, key)) {
-                    return await handlerState[key].handlers[0](req, res, nextFunc(handlerState[key].handlers));
-                }
-                else if ((await gConfig?.customValidator?.(req, key)) == null) {
-                    return next({ status: 401, json: { message: "unauthorized" } });
-                }
-                else if (i === keys.length - 1) {
-                    next({
-                        status: 405,
-                        json: { message: "you don't have access to this section" },
-                    });
-                }
-                else
-                    continue;
-            }
-        }
-        catch (error) {
-            console.log("auth", 42, error);
-            next({
-                status: 403,
-                json: {
-                    message: error instanceof Error
-                        ? error.message
-                        : "error on authentication please login again",
-                },
-            });
-        }
-    };
-    holders.admin = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error("handlers must be an array");
-        const hasConfig = typeof handlers[0] === "object" && "permission" in handlers[0];
-        const configObj = hasConfig
-            ? handlers[0]
-            : undefined;
-        const handlerFns = hasConfig
-            ? handlers.slice(1)
-            : handlers;
-        handlerState[`admin${configObj?.permission ? `:${configObj.permission}` : ""}`] = {
-            ...(configObj ? { config: configObj } : {}),
-            handlers: handlerFns,
-        };
-        return useAuth;
-    };
-    holders.user = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error("handlers must be an array");
-        handlerState.user = { handlers };
-        return useAuth;
-    };
-    holders.any = (...handlers) => {
-        if (!Array.isArray(handlers))
-            throw new Error("handlers must be an array");
-        handlerState.any = { handlers };
-        return useAuth;
-    };
-    useAuth = Object.assign(useAuth, holders);
-    return useAuth;
-};
-console.log("auth", 81, typeof auth);
-exports.default = auth;