@seam-rpc/server 4.3.19 → 4.3.20

package/dist/bin/generate.js

@@ -119,6 +119,7 @@ function convert(schema) {
 export async function generateClientFile({ tsPath, jsPath, outputPath, }) {
     const tsFile = path.resolve(process.cwd(), tsPath);
     const tsFileName = path.basename(tsFile).slice(0, -path.extname(tsFile).length);
+    const routerName = path.basename(tsFile).slice(0, tsFile.indexOf("."));
     const jsFile = path.resolve(process.cwd(), path.join(jsPath, tsFileName + ".js"));
     if (!existsSync(tsFile)) {
         throw new Error(`TS file not found: ${tsFile}`);
@@ -128,7 +129,7 @@ export async function generateClientFile({ tsPath, jsPath, outputPath, }) {
     }
     const mod = await import("file://" + jsFile);
     const procedures = mod.default;
-    const routerName = path.basename(jsFile, path.extname(jsFile));
+    // const routerName = path.basename(jsFile, path.extname(jsFile));
     const procMetadata = getProcedureMetadata(tsFile);
     let output = `/**
  * +===================================+

package/dist/index.d.ts

@@ -31,7 +31,7 @@ export interface SeamEvents {
     inputValidationError: [error: unknown, context: SeamErrorContext];
     outputValidationError: [error: unknown, context: SeamErrorContext];
 }
-type ProcedureHandler<Input extends ProcedureInput, Output extends ProcedureOutput, Errors extends ProcedureErrors> = (options: ProcedureOptions<Input, Errors>) => Result<z.infer<Output>, unknown> | Promise<Result<z.infer<Output>, unknown>>;
+type ProcedureHandler<Input extends ProcedureInput, Output extends ProcedureOutput, Errors extends ProcedureErrors> = (options: ProcedureOptions<Input, Errors>) => Result<z.infer<Output>, RpcError> | Promise<Result<z.infer<Output>, RpcError>>;
 interface ProcedureOptions<Input extends ProcedureInput, Errors extends ProcedureErrors> {
     input: Simplify<ProcedureInputData<Input>>;
     ctx: SeamContext;

package/dist/index.js

@@ -58,7 +58,7 @@ export class SeamRouter {
                 return res.sendStatus(404);
             let input;
             let validatedInput = undefined;
-            let output;
+            let output = undefined;
             let validatedOutput;
             // Middleware
             try {
@@ -91,22 +91,18 @@ export class SeamRouter {
             const ctx = {
                 request: req,
                 response: res,
-                next
+                next,
             };
+            function toResError(error) {
+                if (error instanceof RpcError)
+                    return { rpcError: true, error: error.toJSON() };
+                else
+                    return { rpcError: false };
+            }
             try {
                 output = await procedure.handler({ input: validatedInput, ctx, error: errorHandler });
             }
             catch (error) {
-                let errorResult = { rpcError: false };
-                if (error instanceof RpcError) {
-                    errorResult = {
-                        rpcError: true,
-                        error: {
-                            code: error.code,
-                            data: error.data,
-                        }
-                    };
-                }
                 seamSpace.emit("apiError", error, {
                     routerPath: path,
                     procedureName: req.params.procName,
@@ -116,12 +112,12 @@ export class SeamRouter {
                     validatedOutput,
                     request: req,
                     response: res,
-                    next: () => { res.status(400).json(errorResult); return next(); },
+                    next: () => { res.status(400).json(toResError(error)); return next(); },
                 });
                 return;
             }
-            if (output.ok !== true) {
-                seamSpace.emit("apiError", new RpcError(output.error, undefined), {
+            if (!output.ok) {
+                seamSpace.emit("apiError", output.error, {
                     routerPath: path,
                     procedureName: req.params.procName,
                     input,
@@ -130,7 +126,7 @@ export class SeamRouter {
                     validatedOutput,
                     request: req,
                     response: res,
-                    next: () => { res.status(400).json(output.error); return next(); },
+                    next: () => { res.status(400).json(toResError(output.error)); return next(); },
                 });
                 return;
             }
@@ -187,7 +183,6 @@ export class SeamRouter {
                     response: res,
                     next: next,
                 });
-                console.log("INTERNAL ERROR", error);
                 res.sendStatus(500); //.send({ error: String(error) });
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seam-rpc/server",
-  "version": "4.3.19",
+  "version": "4.3.20",
   "main": "dist/index.js",
   "type": "module",
   "bin": {