arcway 0.1.25 → 0.1.27

package/server/ws/ws-router.js

@@ -5,6 +5,19 @@ import { parseCookies, resolveSession, flattenHeaders } from '../session/helpers
 import { getMiddlewareForRoute } from '../router/middleware.js';
 import { toErrorMessage } from '../helpers.js';
 
+function normalizeWsMsg(wsMsg) {
+  const rawPath = wsMsg.path;
+  const url = new URL(rawPath, 'http://localhost');
+  const query = Object.fromEntries(url.searchParams.entries());
+
+  return {
+    ...wsMsg,
+    path: rawPath,
+    pathname: url.pathname,
+    query: { ...query, ...(wsMsg.query ?? {}) },
+  };
+}
+
 class WsRouter {
   _apiRouter;
   _log;
@@ -149,16 +162,17 @@ class WsRouter {
       return;
     }
 
-    const method = parsed.method.toUpperCase();
+    const normalized = normalizeWsMsg(parsed);
+    const method = normalized.method.toUpperCase();
     if (method === 'SUBSCRIBE') {
-      await this._handleSubscribe(client, { ...parsed, method });
+      await this._handleSubscribe(client, { ...normalized, method });
     } else if (method === 'UNSUBSCRIBE') {
-      await this._handleUnsubscribe(client, { ...parsed, method });
+      await this._handleUnsubscribe(client, { ...normalized, method });
     } else if (['GET', 'POST', 'PUT', 'PATCH', 'DELETE'].includes(method)) {
-      await this._handleMethodCall(client, { ...parsed, method });
+      await this._handleMethodCall(client, { ...normalized, method });
     } else {
       this._send(client, {
-        path: parsed.path,
+        path: normalized.path,
         error: { code: 'INVALID_METHOD', message: `Unsupported method: ${method}` },
       });
     }
@@ -167,6 +181,7 @@ class WsRouter {
   // ── Subscribe / Unsubscribe ──
 
   async _handleSubscribe(client, wsMsg) {
+    wsMsg = wsMsg.pathname ? wsMsg : normalizeWsMsg(wsMsg);
     const msgPath = wsMsg.path;
     if (client.subscriptions.has(msgPath)) {
       this._send(client, {
@@ -176,7 +191,7 @@ class WsRouter {
       return;
     }
 
-    const matched = this._apiRouter.findRoute('GET', msgPath);
+    const matched = this._apiRouter.findRoute('GET', wsMsg.pathname);
     if (!matched) {
       this._send(client, {
         path: msgPath,
@@ -296,8 +311,9 @@ class WsRouter {
   // ── Method calls (GET/POST/PUT/PATCH/DELETE) ──
 
   async _handleMethodCall(client, wsMsg) {
+    wsMsg = wsMsg.pathname ? wsMsg : normalizeWsMsg(wsMsg);
     const { path: msgPath, method } = wsMsg;
-    const matched = this._apiRouter.findRoute(method, msgPath);
+    const matched = this._apiRouter.findRoute(method, wsMsg.pathname);
 
     if (!matched) {
       this._send(client, {
@@ -330,7 +346,7 @@ class WsRouter {
     return {
       id: randomUUID(),
       method: wsMsg.method,
-      path: wsMsg.path,
+      path: wsMsg.pathname ?? wsMsg.path,
       query: { ...(wsMsg.query ?? {}), ...params },
       body: wsMsg.body,
       headers: client.headers,

package/client/hooks/use-form.js

@@ -1,86 +0,0 @@
-import { useState, useCallback, useRef } from 'react';
-import { ArkErrors } from 'arktype';
-
-export default function useForm(options) {
-  const [values, setValues] = useState(options.initialValues);
-  const [errors, setErrors] = useState({});
-  const [touched, setTouched] = useState({});
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const initialRef = useRef(options.initialValues);
-  const schemaRef = useRef(options.schema);
-  schemaRef.current = options.schema;
-  const onSubmitRef = useRef(options.onSubmit);
-  onSubmitRef.current = options.onSubmit;
-  const valuesRef = useRef(values);
-  valuesRef.current = values;
-
-  const isDirty = Object.keys(initialRef.current).some(
-    (key) => values[key] !== initialRef.current[key],
-  );
-
-  function setField(name, value) {
-    setValues((prev) => ({ ...prev, [name]: value }));
-    setTouched((prev) => ({ ...prev, [name]: true }));
-    setErrors((prev) => {
-      if (!prev[name]) return prev;
-      const next = { ...prev };
-      delete next[name];
-      return next;
-    });
-  }
-
-  const setError = useCallback((name, message) => {
-    setErrors((prev) => ({ ...prev, [name]: message }));
-  }, []);
-
-  const handleSubmit = useCallback(async (e) => {
-    e?.preventDefault?.();
-    const currentValues = valuesRef.current;
-    const schema = schemaRef.current;
-
-    if (schema) {
-      const result = schema(currentValues);
-      if (result instanceof ArkErrors) {
-        const fieldErrors = {};
-        for (const err of result) {
-          const key = String(err.path[0]);
-          if (key && !fieldErrors[key]) {
-            fieldErrors[key] = err.message;
-          }
-        }
-        setErrors(fieldErrors);
-        return;
-      }
-    }
-
-    setErrors({});
-    setIsSubmitting(true);
-    try {
-      await onSubmitRef.current(currentValues);
-    } finally {
-      setIsSubmitting(false);
-    }
-  }, []);
-
-  const reset = useCallback((newValues) => {
-    const resetTo = newValues ?? initialRef.current;
-    if (newValues) initialRef.current = newValues;
-    setValues(resetTo);
-    setErrors({});
-    setTouched({});
-    setIsSubmitting(false);
-  }, []);
-
-  return {
-    values,
-    errors,
-    touched,
-    isDirty,
-    isSubmitting,
-    setField,
-    setError,
-    handleSubmit,
-    reset,
-  };
-}