@internetderdinge/api 1.229.27 → 1.229.31

package/src/admin/adminSearch.validation.ts

@@ -0,0 +1,28 @@
+import { z } from "zod";
+
+export const adminSearchSchema = {
+  query: z.object({
+    search: z.string().max(120).optional(),
+    limit: z.coerce.number().min(1).max(50).optional(),
+  }),
+};
+
+export const adminStatsSchema = {
+  query: z.object({}),
+};
+
+export const adminIotDevicesSchema = {
+  query: z.object({
+    page: z.coerce.number().int().min(1).optional(),
+    perPage: z.coerce.number().int().min(1).max(500).optional(),
+    updatedSince: z.string().datetime().optional(),
+  }),
+};
+
+export const adminDevicesSchema = {
+  query: z.object({
+    page: z.coerce.number().int().min(1).optional(),
+    perPage: z.coerce.number().int().min(1).max(500).optional(),
+    updatedSince: z.string().datetime().optional(),
+  }),
+};

package/src/index.ts

@@ -15,6 +15,7 @@ export { default as i18n } from "../src/i18n/i18n";
 export { default as usersRoute } from "../src/users/users.route";
 export { default as usersService } from "../src/users/users.service";
 export { default as accountsRoute } from "../src/accounts/accounts.route";
+export { default as adminSearchRoute } from "../src/admin/adminSearch.route";
 export { default as accountsService } from "../src/accounts/accounts.service";
 export { auth0 } from "../src/accounts/auth0.service";
 export { default as organizationsRoute } from "../src/organizations/organizations.route";

package/src/iotdevice/iotdevice.route.ts

@@ -40,6 +40,7 @@ import {
   getApiStatus,
   getEntry,
   updateEntry,
+  ledLightHint,
 } from "./iotdevice.controller";
 import { request } from "https";
 
@@ -113,7 +114,7 @@ export const iotdeviceRouteSpecs: RouteSpec[] = [
     path: "/ledlight/:deviceId",
     validate: [auth("getUsers"), validateAdmin],
     responseSchema: pingResponseSchema,
-    handler: pingDevice,
+    handler: ledLightHint,
     summary: "Ping device LED light",
     description:
       "Sends a ping to the device’s LED light to test its connectivity or response.",

package/src/utils/buildRouterAndDocs.ts

@@ -21,6 +21,10 @@ export type RouteSpec = {
   validate?: RequestHandler<any, any, any, any, any>[];
   validateWithRequestSchema?: RequestHandler<any, any, any, any, any>[];
   requestSchema?: Partial<Record<string, ZodTypeAny>>;
+  requestBody?: {
+    required?: boolean;
+    content: Record<string, { schema: ZodTypeAny }>;
+  };
   responseSchema?: ZodTypeAny;
   handler: RequestHandler<any, any, any, any, any>;
   summary: string;
@@ -36,31 +40,22 @@ export default function buildAiRouterAndDocs(
   tags: string[] = [],
 ) {
   routeSpecs.forEach((spec) => {
-    // mount Express
-
-    if (!spec.validate) {
-      spec.validate = [];
-    }
-
-    if (spec.requestSchema) {
-      spec.validateWithRequestSchema = [
-        validateZod(spec.requestSchema),
-        ...spec.validate,
-      ];
-    }
-
-    if (spec.validateWithRequestSchema) {
-      router[spec.method](
-        spec.path,
-        ...spec.validateWithRequestSchema,
-        spec.handler,
-      );
-    }
-
-    var { body, ...rest } = spec.requestSchema || {};
-
-    if (body) {
-      rest.body = {
+    const validate = spec.validate || [];
+    const routeMiddleware =
+      spec.validateWithRequestSchema ||
+      (spec.requestSchema
+        ? [validateZod(spec.requestSchema), ...validate]
+        : validate);
+
+    router[spec.method](spec.path, ...routeMiddleware, spec.handler);
+
+    const { body, ...rest } = spec.requestSchema || {};
+    const request = { ...rest } as Record<string, unknown>;
+
+    if (spec.requestBody) {
+      request.body = spec.requestBody;
+    } else if (body) {
+      request.body = {
         content: {
           "application/json": {
             schema: body,
@@ -71,12 +66,12 @@ export default function buildAiRouterAndDocs(
 
     if (
       spec.responseSchema &&
-      !hasRoleValidation(spec.validate) &&
+      !hasRoleValidation(spec.validateWithRequestSchema || validate) &&
       spec.privateDocs !== true &&
       spec.memoOnly !== true
     ) {
       // collect all middleware fn names (falls back to '<anonymous>' if unnamed)
-      const middlewareNames = (spec.validate || []).map(
+      const middlewareNames = (spec.validateWithRequestSchema || validate).map(
         (fn) => `\`${fn.name}\`` || "<anonymous>",
       );
       const openApiPath = (basePath + spec.path).replace(
@@ -88,7 +83,7 @@ export default function buildAiRouterAndDocs(
         method: spec.method,
         path: openApiPath,
         summary: spec.summary,
-        request: rest,
+        request,
 
         // append middleware names to the description
         description: [

package/src/utils/registerOpenApi.ts

@@ -6,6 +6,17 @@ extendZodWithOpenApi(z);
 
 export const registry = new OpenAPIRegistry();
 
+export const xApiKey = registry.registerComponent(
+  "securitySchemes",
+  "x-api-key",
+  {
+    type: "apiKey",
+    in: "header",
+    name: "x-api-key",
+    description: "API key for authentication",
+  },
+);
+
 // add Bearer JWT auth
 export const bearerAuth = registry.registerComponent(
   "securitySchemes",
@@ -18,17 +29,6 @@ export const bearerAuth = registry.registerComponent(
   },
 );
 
-export const xApiKey = registry.registerComponent(
-  "securitySchemes",
-  "x-api-key",
-  {
-    type: "apiKey",
-    in: "header",
-    name: "x-api-key",
-    description: "API key for authentication",
-  },
-);
-
 const UserSchema = z
   .object({
     id: z.string().openapi({ example: "1212121" }),
@@ -37,26 +37,7 @@ const UserSchema = z
   })
   .openapi("User");
 
-registry.registerPath({
-  method: "get",
-  path: "/usersnnn/{id}",
-  summary: "Get a single user",
-  request: {
-    params: z.object({ id: z.string() }),
-  },
-
-  responses: {
-    200: {
-      description: "Object with user data.",
-      content: {
-        "application/json": {
-          schema: UserSchema,
-        },
-      },
-    },
-  },
-});
-
+/*
 registry.registerPath({
   method: "get",
   path: "/users/{id}",
@@ -81,3 +62,4 @@ registry.registerPath({
     },
   },
 });
+*/