@vorplex/api 0.0.54 → 0.0.56

package/dist/server/server/server.model.js

@@ -1,4 +1,4 @@
-import { $Array, $Router, $String, $Tson, Emitter, Injector, MimeType, Task, TsonError, WebClient } from '@vorplex/core';
+import { $Array, $Router, $String, $Tson, Emitter, Injector, MimeType, Task, WebClient } from '@vorplex/core';
 import * as fs from 'fs';
 import { Server as NodeHttpServer } from 'http';
 import { Server as NodeHttpsServer } from 'https';
@@ -217,23 +217,18 @@ export class Server {
                 }
             });
             const schema = $Tson.parse(definition);
-            let parsedPacket;
-            try {
-                parsedPacket = schema.parse(packet);
-            }
-            catch (error) {
-                if (error instanceof TsonError) {
-                    client.send({
-                        error: {
-                            message: error.message,
-                            path: error.path,
-                            schema: error.schema
-                        },
-                        schema
-                    });
-                    return;
-                }
-                throw error;
+            const [parsedPacket, packetErrors] = schema.parse(packet);
+            if (packetErrors.length > 0) {
+                const [parseError] = packetErrors;
+                client.send({
+                    error: {
+                        message: parseError.message,
+                        path: parseError.path,
+                        schema: parseError.schema
+                    },
+                    schema
+                });
+                return;
             }
             const task = new Task(`[${parsedPacket.id}] Packet`);
             try {
@@ -246,21 +241,17 @@ export class Server {
                                 });
                                 let data = parsedPacket.data;
                                 if (action.schema) {
-                                    try {
-                                        data = $Tson.parse(action.schema).parse(parsedPacket.data);
-                                    }
-                                    catch (error) {
-                                        if (error instanceof TsonError) {
-                                            throw new WebError(`Failed to parse packet data for hub (${hub.name}) with action (${action.name})`, {
-                                                message: error.message,
-                                                path: error.path,
-                                                schema: error.schema,
-                                                value: error.value
-                                            });
-                                        }
-                                        else
-                                            throw error;
+                                    const [parsedData, dataErrors] = $Tson.parse(action.schema).parse(parsedPacket.data);
+                                    if (dataErrors.length > 0) {
+                                        const [dataError] = dataErrors;
+                                        throw new WebError(`Failed to parse packet data for hub (${hub.name}) with action (${action.name})`, {
+                                            message: dataError.message,
+                                            path: dataError.path,
+                                            schema: dataError.schema,
+                                            value: dataError.value
+                                        });
                                     }
+                                    data = parsedData;
                                 }
                                 await action.callback({
                                     injector: this.injector,