autosync_backend2 1.1.5 → 1.1.7

package/dist/env.d.ts

@@ -1,5 +1,4 @@
 declare const EnvSchema: import("@sinclair/typebox").TObject<{
-    LOG_LEVEL: import("elysia/dist/type-system/types").TUnionEnum<["fatal", "error", "warn", "info", "debug", "trace"]>;
     NODE_ENV: import("elysia/dist/type-system/types").TUnionEnum<["development", "production"]>;
     PORT: import("@sinclair/typebox").TNumber;
     BETTER_AUTH_SECRET: import("@sinclair/typebox").TString;

package/dist/index.d.ts

@@ -403,15 +403,9 @@ declare const app: Elysia<"", {
         }>;
         readonly "CrmCpOrderModel.create": import("@sinclair/typebox").TObject<{
             phone: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-            vehicle: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
-                licensePlate: import("@sinclair/typebox").TString;
-            }>, import("@sinclair/typebox").TObject<{
-                vehicleKindId: import("@sinclair/typebox").TString;
-                licensePlate: import("@sinclair/typebox").TString;
-            }>, import("@sinclair/typebox").TObject<{
-                vin: import("@sinclair/typebox").TString;
-                vehicleKindId: import("@sinclair/typebox").TString;
-            }>]>;
+            vin: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            licensePlate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            vehicleKindId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
         }>;
         readonly "CrmCpOrderModel.addPackage": import("@sinclair/typebox").TObject<{
             spPackageId: import("@sinclair/typebox").TString;
@@ -2928,6 +2922,31 @@ declare const app: Elysia<"", {
                 };
             };
         };
+    } & {
+        user: {
+            me: {
+                get: {
+                    body: unknown;
+                    params: {};
+                    query: unknown;
+                    headers: unknown;
+                    response: {
+                        200: {
+                            id: string;
+                            name: string;
+                            emailVerified: boolean;
+                            email: string;
+                            createdAt: Date;
+                            updatedAt: Date;
+                            image?: string | null | undefined | undefined;
+                            companyId: string;
+                            branchId: string;
+                            kind: "ADMIN" | "COMPANY_ADMIN" | "CUSTOMER";
+                        };
+                    };
+                };
+            };
+        };
     } & {
         user: {
             post: {
@@ -3920,15 +3939,9 @@ declare const app: Elysia<"", {
                 post: {
                     body: {
                         phone?: string | undefined;
-                        vehicle: {
-                            licensePlate: string;
-                        } | {
-                            vehicleKindId: string;
-                            licensePlate: string;
-                        } | {
-                            vehicleKindId: string;
-                            vin: string;
-                        };
+                        vehicleKindId?: string | undefined;
+                        vin?: string | undefined;
+                        licensePlate?: string | undefined;
                     };
                     params: {};
                     query: unknown;
@@ -3946,6 +3959,7 @@ declare const app: Elysia<"", {
                             companyBranchId: string;
                         };
                         502: string;
+                        400: "Машины дугаар болон VIN хоёроос нэгийг нь оруулна уу." | "Машины VIN оруулсан бол машины төрөл оруулна уу.";
                         422: {
                             type: "validation";
                             on: string;

package/dist/index.js

@@ -1147,7 +1147,7 @@ var require_ms = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/@tokenizer/inflate/node_modules/debug/src/common.js
+// node_modules/debug/src/common.js
 var require_common = __commonJS((exports, module) => {
   function setup(env) {
     createDebug.debug = createDebug;
@@ -1322,7 +1322,7 @@ var require_common = __commonJS((exports, module) => {
   module.exports = setup;
 });
 
-// node_modules/@tokenizer/inflate/node_modules/debug/src/browser.js
+// node_modules/debug/src/browser.js
 var require_browser = __commonJS((exports, module) => {
   exports.formatArgs = formatArgs;
   exports.save = save;
@@ -1482,7 +1482,7 @@ var require_browser = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/@tokenizer/inflate/node_modules/debug/src/node.js
+// node_modules/debug/src/node.js
 var require_node = __commonJS((exports, module) => {
   var tty = __require("tty");
   var util = __require("util");
@@ -1653,7 +1653,7 @@ var require_node = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/@tokenizer/inflate/node_modules/debug/src/index.js
+// node_modules/debug/src/index.js
 var require_src = __commonJS((exports, module) => {
   if (typeof process === "undefined" || process.type === "renderer" || false || process.__nwjs) {
     module.exports = require_browser();
@@ -18342,6 +18342,8 @@ var require_defaults = __commonJS((exports, module) => {
 // node_modules/pg/lib/utils.js
 var require_utils = __commonJS((exports, module) => {
   var defaults = require_defaults();
+  var util4 = __require("util");
+  var { isDate: isDate2 } = util4.types || util4;
   function escapeElement(elementRepresentation) {
     const escaped = elementRepresentation.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
     return '"' + escaped + '"';
@@ -18389,7 +18391,7 @@ var require_utils = __commonJS((exports, module) => {
         }
         return buf.slice(val.byteOffset, val.byteOffset + val.byteLength);
       }
-      if (val instanceof Date) {
+      if (isDate2(val)) {
         if (defaults.parseInputDatesAsUTC) {
           return dateToStringUTC(val);
         } else {
@@ -18463,6 +18465,12 @@ var require_utils = __commonJS((exports, module) => {
   var escapeLiteral = function(str) {
     let hasBackslash = false;
     let escaped = "'";
+    if (str == null) {
+      return "''";
+    }
+    if (typeof str !== "string") {
+      return "''";
+    }
     for (let i2 = 0;i2 < str.length; i2++) {
       const c = str[i2];
       if (c === "'") {
@@ -18906,10 +18914,14 @@ var require_pg_connection_string = __commonJS((exports, module) => {
       str = encodeURI(str).replace(/%25(\d\d)/g, "%$1");
     }
     try {
-      result = new URL(str, "postgres://base");
-    } catch (e) {
-      result = new URL(str.replace("@/", "@___DUMMY___/"), "postgres://base");
-      dummyHost = true;
+      try {
+        result = new URL(str, "postgres://base");
+      } catch (e) {
+        result = new URL(str.replace("@/", "@___DUMMY___/"), "postgres://base");
+        dummyHost = true;
+      }
+    } catch (err2) {
+      err2.input && (err2.input = "*****REDACTED*****");
     }
     for (const entry of result.searchParams.entries()) {
       config2[entry[0]] = entry[1];
@@ -20244,153 +20256,10 @@ var require_dist2 = __commonJS((exports) => {
   exports.parse = parse4;
 });
 
-// node_modules/pg-cloudflare/dist/index.js
-var require_dist3 = __commonJS((exports) => {
+// node_modules/pg-cloudflare/dist/empty.js
+var require_empty = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.CloudflareSocket = undefined;
-  var events_1 = __require("events");
-
-  class CloudflareSocket extends events_1.EventEmitter {
-    constructor(ssl) {
-      super();
-      this.ssl = ssl;
-      this.writable = false;
-      this.destroyed = false;
-      this._upgrading = false;
-      this._upgraded = false;
-      this._cfSocket = null;
-      this._cfWriter = null;
-      this._cfReader = null;
-    }
-    setNoDelay() {
-      return this;
-    }
-    setKeepAlive() {
-      return this;
-    }
-    ref() {
-      return this;
-    }
-    unref() {
-      return this;
-    }
-    async connect(port, host, connectListener) {
-      try {
-        log2("connecting");
-        if (connectListener)
-          this.once("connect", connectListener);
-        const options = this.ssl ? { secureTransport: "starttls" } : {};
-        const mod = await import("cloudflare:sockets");
-        const connect = mod.connect;
-        this._cfSocket = connect(`${host}:${port}`, options);
-        this._cfWriter = this._cfSocket.writable.getWriter();
-        this._addClosedHandler();
-        this._cfReader = this._cfSocket.readable.getReader();
-        if (this.ssl) {
-          this._listenOnce().catch((e) => this.emit("error", e));
-        } else {
-          this._listen().catch((e) => this.emit("error", e));
-        }
-        await this._cfWriter.ready;
-        log2("socket ready");
-        this.writable = true;
-        this.emit("connect");
-        return this;
-      } catch (e) {
-        this.emit("error", e);
-      }
-    }
-    async _listen() {
-      while (true) {
-        log2("awaiting receive from CF socket");
-        const { done, value } = await this._cfReader.read();
-        log2("CF socket received:", done, value);
-        if (done) {
-          log2("done");
-          break;
-        }
-        this.emit("data", Buffer.from(value));
-      }
-    }
-    async _listenOnce() {
-      log2("awaiting first receive from CF socket");
-      const { done, value } = await this._cfReader.read();
-      log2("First CF socket received:", done, value);
-      this.emit("data", Buffer.from(value));
-    }
-    write(data, encoding = "utf8", callback = () => {}) {
-      if (data.length === 0)
-        return callback();
-      if (typeof data === "string")
-        data = Buffer.from(data, encoding);
-      log2("sending data direct:", data);
-      this._cfWriter.write(data).then(() => {
-        log2("data sent");
-        callback();
-      }, (err2) => {
-        log2("send error", err2);
-        callback(err2);
-      });
-      return true;
-    }
-    end(data = Buffer.alloc(0), encoding = "utf8", callback = () => {}) {
-      log2("ending CF socket");
-      this.write(data, encoding, (err2) => {
-        this._cfSocket.close();
-        if (callback)
-          callback(err2);
-      });
-      return this;
-    }
-    destroy(reason) {
-      log2("destroying CF socket", reason);
-      this.destroyed = true;
-      return this.end();
-    }
-    startTls(options) {
-      if (this._upgraded) {
-        this.emit("error", "Cannot call `startTls()` more than once on a socket");
-        return;
-      }
-      this._cfWriter.releaseLock();
-      this._cfReader.releaseLock();
-      this._upgrading = true;
-      this._cfSocket = this._cfSocket.startTls(options);
-      this._cfWriter = this._cfSocket.writable.getWriter();
-      this._cfReader = this._cfSocket.readable.getReader();
-      this._addClosedHandler();
-      this._listen().catch((e) => this.emit("error", e));
-    }
-    _addClosedHandler() {
-      this._cfSocket.closed.then(() => {
-        if (!this._upgrading) {
-          log2("CF socket closed");
-          this._cfSocket = null;
-          this.emit("close");
-        } else {
-          this._upgrading = false;
-          this._upgraded = true;
-        }
-      }).catch((e) => this.emit("error", e));
-    }
-  }
-  exports.CloudflareSocket = CloudflareSocket;
-  var debug2 = false;
-  function dump(data) {
-    if (data instanceof Uint8Array || data instanceof ArrayBuffer) {
-      const hex2 = Buffer.from(data).toString("hex");
-      const str = new TextDecoder().decode(data);
-      return `
->>> STR: "${str.replace(/\n/g, "\\n")}"
->>> HEX: ${hex2}
-`;
-    } else {
-      return data;
-    }
-  }
-  function log2(...args) {
-    debug2 && console.log(...args.map(dump));
-  }
+  exports.default = {};
 });
 
 // node_modules/pg/lib/stream.js
@@ -20416,7 +20285,7 @@ var require_stream = __commonJS((exports, module) => {
   }
   function getCloudflareStreamFuncs() {
     function getStream2(ssl) {
-      const { CloudflareSocket } = require_dist3();
+      const { CloudflareSocket } = require_empty();
       return new CloudflareSocket(ssl);
     }
     function getSecureStream2(options) {
@@ -21553,14 +21422,19 @@ var require_pg_pool = __commonJS((exports, module) => {
       }
       throw new Error("unexpected condition");
     }
-    _remove(client) {
+    _remove(client, callback) {
       const removed = removeWhere(this._idle, (item) => item.client === client);
       if (removed !== undefined) {
         clearTimeout(removed.timeoutId);
       }
       this._clients = this._clients.filter((c) => c !== client);
-      client.end();
-      this.emit("remove", client);
+      const context = this;
+      client.end(() => {
+        context.emit("remove", client);
+        if (typeof callback === "function") {
+          callback();
+        }
+      });
     }
     connect(cb) {
       if (this.ending) {
@@ -21689,23 +21563,19 @@ var require_pg_pool = __commonJS((exports, module) => {
         if (client._poolUseCount >= this.options.maxUses) {
           this.log("remove expended client");
         }
-        this._remove(client);
-        this._pulseQueue();
-        return;
+        return this._remove(client, this._pulseQueue.bind(this));
       }
       const isExpired = this._expired.has(client);
       if (isExpired) {
         this.log("remove expired client");
         this._expired.delete(client);
-        this._remove(client);
-        this._pulseQueue();
-        return;
+        return this._remove(client, this._pulseQueue.bind(this));
       }
       let tid;
       if (this.options.idleTimeoutMillis && this._isAboveMin()) {
         tid = setTimeout(() => {
           this.log("remove idle client");
-          this._remove(client);
+          this._remove(client, this._pulseQueue.bind(this));
         }, this.options.idleTimeoutMillis);
         if (this.options.allowExitOnIdle) {
           tid.unref();
@@ -51136,7 +51006,7 @@ var require_version = __commonJS((exports) => {
 });
 
 // node_modules/uuid/dist/index.js
-var require_dist4 = __commonJS((exports) => {
+var require_dist3 = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", {
     value: true
   });
@@ -51438,7 +51308,7 @@ var require_icon_set_ext_xform = __commonJS((exports, module) => {
 
 // node_modules/exceljs/lib/xlsx/xform/sheet/cf-ext/cf-rule-ext-xform.js
 var require_cf_rule_ext_xform = __commonJS((exports, module) => {
-  var { v4: uuidv4 } = require_dist4();
+  var { v4: uuidv4 } = require_dist3();
   var BaseXform = require_base_xform();
   var CompositeXform = require_composite_xform();
   var DatabarExtXform = require_databar_ext_xform();
@@ -112558,7 +112428,6 @@ var index_default2 = swagger;
 
 // src/env.ts
 var EnvSchema = t.Object({
-  LOG_LEVEL: t.UnionEnum(["fatal", "error", "warn", "info", "debug", "trace"]),
   NODE_ENV: t.UnionEnum(["development", "production"], {
     default: "development"
   }),
@@ -141037,24 +140906,24 @@ var levels2 = {
   test: "error",
   production: "info"
 };
-var transport = {
+var transport = env_default.NODE_ENV === "development" ? {
   target: "pino-pretty",
   options: {
     colorize: true,
     translateTime: "SYS:standard",
     ignore: "pid,hostname"
   }
-};
+} : undefined;
 var logger2 = import_pino.pino({
-  level: levels2["development"] || "info",
+  level: levels2[env_default.NODE_ENV] || "info",
   transport,
   base: {
-    env: "development",
+    env: env_default.NODE_ENV,
     service: "autosync"
   },
   timestamp: () => `,"time":"${new Date().toISOString()}"`
 });
-var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest(({ request }) => {
+var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest(async ({ request }) => {
   const url = new URL(request.url);
   logger2.info({
     msg: "Incoming request",
@@ -141065,7 +140934,7 @@ var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest((
       "content-type": request.headers.get("content-type")
     },
     query: url.searchParams,
-    body: request.body
+    body: await request.json()
   });
 }).onAfterResponse(async ({ request, response, server, status: status2, set: set2, body, headers }) => {
   logger2.info({
@@ -141095,8 +140964,11 @@ var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest((
     url: request.url,
     code,
     error: "message" in error2 ? error2.message : "Unknown error",
-    stack: "stack" in error2 ? error2.stack : undefined
+    stack: env_default.NODE_ENV === "development" && "stack" in error2 ? error2.stack : undefined
   });
+  if (code === "VALIDATION") {
+    return error2.validator.Errors(error2.value).First().message;
+  }
 });
 
 // src/lib/db/helpers/pagination.helper.ts
@@ -143264,11 +143136,17 @@ var CrmVehicleLogic;
     return json2;
   };
   CrmVehicleLogic.findOrCreate = async (body, tdb = db_default) => {
-    const [currentVehicle] = await tdb.select().from(crmVehicleTable).where("vin" in body ? eq(crmVehicleTable.vin, body.vin) : eq(crmVehicleTable.licensePlate, body.licensePlate)).limit(1);
+    if (body.licensePlate === undefined && body.vin === undefined) {
+      return status("Bad Request", "\u041C\u0430\u0448\u0438\u043D\u044B \u0434\u0443\u0433\u0430\u0430\u0440 \u0431\u043E\u043B\u043E\u043D VIN \u0445\u043E\u0451\u0440\u043E\u043E\u0441 \u043D\u044D\u0433\u0438\u0439\u0433 \u043D\u044C \u043E\u0440\u0443\u0443\u043B\u043D\u0430 \u0443\u0443.");
+    }
+    if (body.vin && !body.vehicleKindId) {
+      return status("Bad Request", "\u041C\u0430\u0448\u0438\u043D\u044B VIN \u043E\u0440\u0443\u0443\u043B\u0441\u0430\u043D \u0431\u043E\u043B \u043C\u0430\u0448\u0438\u043D\u044B \u0442\u04E9\u0440\u04E9\u043B \u043E\u0440\u0443\u0443\u043B\u043D\u0430 \u0443\u0443.");
+    }
+    const [currentVehicle] = await tdb.select().from(crmVehicleTable).where(body.vin ? eq(crmVehicleTable.vin, body.vin) : eq(crmVehicleTable.licensePlate, body.licensePlate)).limit(1);
     if (currentVehicle) {
       return currentVehicle;
     }
-    if ("vehicleKindId" in body) {
+    if (body.vehicleKindId) {
       const [result2] = await tdb.insert(crmVehicleTable).values({
         vehicleKindId: body.vehicleKindId,
         vin: "vin" in body ? body.vin : null,
@@ -143572,7 +143450,11 @@ var CrmCpOrderLogic;
         }, db2);
         customerId = customer.id;
       }
-      const vehicle = await logic_default6.findOrCreate(body.vehicle, db2);
+      const vehicle = await logic_default6.findOrCreate({
+        vin: body.vin,
+        licensePlate: body.licensePlate,
+        vehicleKindId: body.vehicleKindId
+      }, db2);
       if ("code" in vehicle) {
         return vehicle;
       }
@@ -143652,17 +143534,9 @@ var CrmCpOrderModel;
       minLength: 8,
       maxLength: 8
     })),
-    vehicle: t.Union([
-      t.Object({ licensePlate: t.String() }),
-      t.Object({
-        vehicleKindId: t.String({ format: "uuid" }),
-        licensePlate: t.String()
-      }),
-      t.Object({
-        vin: t.String(),
-        vehicleKindId: t.String({ format: "uuid" })
-      })
-    ])
+    vin: t.Optional(t.String()),
+    licensePlate: t.Optional(t.String()),
+    vehicleKindId: t.Optional(t.String({ format: "uuid" }))
   });
   CrmCpOrderModel.addPackage = t.Object({
     spPackageId: t.String({ format: "uuid" }),
@@ -143768,7 +143642,7 @@ var service_default = serviceRoutes;
 var cpOrderRoutes = new Elysia({
   prefix: "/cp-order",
   tags: ["CrmCpOrder"]
-}).use(better_auth_default).use(service_default).use(product_default).guard({ auth: true }).model(prefix_model_default("CrmCpOrderModel", model_default5)).post("/", async ({ body, user: user2 }) => logic_default10.create(body, user2), {
+}).use(better_auth_default).guard({ auth: true }).use(service_default).use(product_default).model(prefix_model_default("CrmCpOrderModel", model_default5)).post("/", async ({ body, user: user2 }) => logic_default10.create(body, user2), {
   body: "CrmCpOrderModel.create"
 }).post("/package", async ({ body, user: user2 }) => logic_default10.addPackage(body, user2), {
   body: "CrmCpOrderModel.addPackage"
@@ -144483,7 +144357,7 @@ var userRoutes = new Elysia({
     "USER_SELECT_ADMIN",
     "USER_SELECT_OWN"
   ]
-}).post("/", async ({ body, user: user2, permissions }) => logic_default14.registerUser(body, user2, permissions), {
+}).get("/me", async ({ user: user2 }) => user2).post("/", async ({ body, user: user2, permissions }) => logic_default14.registerUser(body, user2, permissions), {
   body: createUserSchema,
   permission: ["USER_CREATE_ADMIN", "USER_CREATE_OWN"]
 }).put("/:id", async ({ body, user: user2, permissions, params: { id } }) => logic_default14.update(id, body, user2, permissions), {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "autosync_backend2",
-	"version": "1.1.5",
+	"version": "1.1.7",
 	"module": "src/index.ts",
 	"type": "module",
 	"main": "dist/index.js",
@@ -32,7 +32,7 @@
 		"fast-xml-parser": "^5.2.5",
 		"generate-password": "^1.7.1",
 		"nodemailer": "^7.0.3",
-		"pg": "^8.16.0",
+		"pg": "^8.16.1",
 		"pino": "^9.7.0",
 		"pino-pretty": "^13.0.0",
 		"react": "^19.1.0",