@replit/river 0.205.0 → 0.205.2

package/dist/logging/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../logging/index.ts","../../logging/log.ts"],"sourcesContent":["export { stringLogger, coloredStringLogger, jsonLogger } from './log';\nexport type { Logger, LogFn, MessageMetadata } from './log';\n","import { ValueError } from '@sinclair/typebox/value';\nimport { OpaqueTransportMessage, ProtocolVersion } from '../transport/message';\nimport { context, trace } from '@opentelemetry/api';\n\nconst LoggingLevels = {\n  debug: -1,\n  info: 0,\n  warn: 1,\n  error: 2,\n} as const;\nexport type LoggingLevel = keyof typeof LoggingLevels;\n\nexport type LogFn = (\n  msg: string,\n  ctx?: MessageMetadata,\n  level?: LoggingLevel,\n) => void;\nexport type Logger = {\n  [key in LoggingLevel]: (msg: string, metadata?: MessageMetadata) => void;\n};\n\nexport type Tags =\n  | 'invariant-violation'\n  | 'state-transition'\n  | 'invalid-request'\n  | 'unhealthy-session'\n  | 'uncaught-handler-error';\n\nconst cleanedLogFn = (log: LogFn) => {\n  return (msg: string, metadata?: MessageMetadata) => {\n    // try to infer telemetry\n    if (metadata && !metadata.telemetry) {\n      const span = trace.getSpan(context.active());\n      if (span) {\n        metadata.telemetry = {\n          traceId: span.spanContext().traceId,\n          spanId: span.spanContext().spanId,\n        };\n      }\n    }\n\n    // skip cloning object if metadata has no transportMessage\n    if (!metadata?.transportMessage) {\n      log(msg, metadata);\n\n      return;\n    }\n\n    // clone metadata and clean transportMessage\n    const { payload, ...rest } = metadata.transportMessage;\n    metadata.transportMessage = rest;\n\n    log(msg, metadata);\n  };\n};\n\nexport type MessageMetadata = Partial<{\n  protocolVersion: ProtocolVersion;\n  clientId: string;\n  connectedTo: string;\n  sessionId: string;\n  connId: string;\n  transportMessage: Partial<OpaqueTransportMessage>;\n  validationErrors: Array<ValueError>;\n  tags: Array<Tags>;\n  telemetry: {\n    traceId: string;\n    spanId: string;\n  };\n  extras?: Record<string, unknown>;\n}>;\n\nexport class BaseLogger implements Logger {\n  minLevel: LoggingLevel;\n  private output: LogFn;\n\n  constructor(output: LogFn, minLevel: LoggingLevel = 'info') {\n    this.minLevel = minLevel;\n    this.output = output;\n  }\n\n  debug(msg: string, metadata?: MessageMetadata) {\n    if (LoggingLevels[this.minLevel] <= LoggingLevels.debug) {\n      this.output(msg, metadata ?? {}, 'debug');\n    }\n  }\n\n  info(msg: string, metadata?: MessageMetadata) {\n    if (LoggingLevels[this.minLevel] <= LoggingLevels.info) {\n      this.output(msg, metadata ?? {}, 'info');\n    }\n  }\n\n  warn(msg: string, metadata?: MessageMetadata) {\n    if (LoggingLevels[this.minLevel] <= LoggingLevels.warn) {\n      this.output(msg, metadata ?? {}, 'warn');\n    }\n  }\n\n  error(msg: string, metadata?: MessageMetadata) {\n    if (LoggingLevels[this.minLevel] <= LoggingLevels.error) {\n      this.output(msg, metadata ?? {}, 'error');\n    }\n  }\n}\n\nexport const stringLogger: LogFn = (msg, ctx, level = 'info') => {\n  const from = ctx?.clientId ? `${ctx.clientId} -- ` : '';\n  console.log(`[river:${level}] ${from}${msg}`);\n};\n\nconst colorMap = {\n  debug: '\\u001b[34m',\n  info: '\\u001b[32m',\n  warn: '\\u001b[33m',\n  error: '\\u001b[31m',\n};\n\nexport const coloredStringLogger: LogFn = (msg, ctx, level = 'info') => {\n  const color = colorMap[level];\n  const from = ctx?.clientId ? `${ctx.clientId} -- ` : '';\n  console.log(`[river:${color}${level}\\u001b[0m] ${from}${msg}`);\n};\n\nexport const jsonLogger: LogFn = (msg, ctx, level) => {\n  console.log(JSON.stringify({ msg, ctx, level }));\n};\n\nexport const createLogProxy = (log: Logger) => ({\n  debug: cleanedLogFn(log.debug.bind(log)),\n  info: cleanedLogFn(log.info.bind(log)),\n  warn: cleanedLogFn(log.warn.bind(log)),\n  error: cleanedLogFn(log.error.bind(log)),\n});\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACEA,iBAA+B;AAwGxB,IAAM,eAAsB,CAAC,KAAK,KAAK,QAAQ,WAAW;AAC/D,QAAM,OAAO,KAAK,WAAW,GAAG,IAAI,QAAQ,SAAS;AACrD,UAAQ,IAAI,UAAU,KAAK,KAAK,IAAI,GAAG,GAAG,EAAE;AAC9C;AAEA,IAAM,WAAW;AAAA,EACf,OAAO;AAAA,EACP,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AACT;AAEO,IAAM,sBAA6B,CAAC,KAAK,KAAK,QAAQ,WAAW;AACtE,QAAM,QAAQ,SAAS,KAAK;AAC5B,QAAM,OAAO,KAAK,WAAW,GAAG,IAAI,QAAQ,SAAS;AACrD,UAAQ,IAAI,UAAU,KAAK,GAAG,KAAK,YAAc,IAAI,GAAG,GAAG,EAAE;AAC/D;AAEO,IAAM,aAAoB,CAAC,KAAK,KAAK,UAAU;AACpD,UAAQ,IAAI,KAAK,UAAU,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;AACjD;","names":[]}
+{"version":3,"sources":["../../logging/index.ts","../../logging/log.ts"],"sourcesContent":["export { stringLogger, coloredStringLogger, jsonLogger } from './log';\nexport type { Logger, LogFn, MessageMetadata } from './log';\n","import { OpaqueTransportMessage, ProtocolVersion } from '../transport/message';\nimport { context, trace } from '@opentelemetry/api';\n\nconst LoggingLevels = {\n  debug: -1,\n  info: 0,\n  warn: 1,\n  error: 2,\n} as const;\nexport type LoggingLevel = keyof typeof LoggingLevels;\n\nexport type LogFn = (\n  msg: string,\n  ctx?: MessageMetadata,\n  level?: LoggingLevel,\n) => void;\nexport type Logger = {\n  [key in LoggingLevel]: (msg: string, metadata?: MessageMetadata) => void;\n};\n\nexport type Tags =\n  | 'invariant-violation'\n  | 'state-transition'\n  | 'invalid-request'\n  | 'unhealthy-session'\n  | 'uncaught-handler-error';\n\nconst cleanedLogFn = (log: LogFn) => {\n  return (msg: string, metadata?: MessageMetadata) => {\n    // try to infer telemetry\n    if (metadata && !metadata.telemetry) {\n      const span = trace.getSpan(context.active());\n      if (span) {\n        metadata.telemetry = {\n          traceId: span.spanContext().traceId,\n          spanId: span.spanContext().spanId,\n        };\n      }\n    }\n\n    // skip cloning object if metadata has no transportMessage\n    if (!metadata?.transportMessage) {\n      log(msg, metadata);\n\n      return;\n    }\n\n    // clone metadata and clean transportMessage\n    const { payload, ...rest } = metadata.transportMessage;\n    metadata.transportMessage = rest;\n\n    log(msg, metadata);\n  };\n};\n\nexport type MessageMetadata = Partial<{\n  protocolVersion: ProtocolVersion;\n  clientId: string;\n  connectedTo: string;\n  sessionId: string;\n  connId: string;\n  transportMessage: Partial<OpaqueTransportMessage>;\n  validationErrors: Array<{ path: string; message: string }>;\n  tags: Array<Tags>;\n  telemetry: {\n    traceId: string;\n    spanId: string;\n  };\n  extras?: Record<string, unknown>;\n}>;\n\nexport class BaseLogger implements Logger {\n  minLevel: LoggingLevel;\n  private output: LogFn;\n\n  constructor(output: LogFn, minLevel: LoggingLevel = 'info') {\n    this.minLevel = minLevel;\n    this.output = output;\n  }\n\n  debug(msg: string, metadata?: MessageMetadata) {\n    if (LoggingLevels[this.minLevel] <= LoggingLevels.debug) {\n      this.output(msg, metadata ?? {}, 'debug');\n    }\n  }\n\n  info(msg: string, metadata?: MessageMetadata) {\n    if (LoggingLevels[this.minLevel] <= LoggingLevels.info) {\n      this.output(msg, metadata ?? {}, 'info');\n    }\n  }\n\n  warn(msg: string, metadata?: MessageMetadata) {\n    if (LoggingLevels[this.minLevel] <= LoggingLevels.warn) {\n      this.output(msg, metadata ?? {}, 'warn');\n    }\n  }\n\n  error(msg: string, metadata?: MessageMetadata) {\n    if (LoggingLevels[this.minLevel] <= LoggingLevels.error) {\n      this.output(msg, metadata ?? {}, 'error');\n    }\n  }\n}\n\nexport const stringLogger: LogFn = (msg, ctx, level = 'info') => {\n  const from = ctx?.clientId ? `${ctx.clientId} -- ` : '';\n  console.log(`[river:${level}] ${from}${msg}`);\n};\n\nconst colorMap = {\n  debug: '\\u001b[34m',\n  info: '\\u001b[32m',\n  warn: '\\u001b[33m',\n  error: '\\u001b[31m',\n};\n\nexport const coloredStringLogger: LogFn = (msg, ctx, level = 'info') => {\n  const color = colorMap[level];\n  const from = ctx?.clientId ? `${ctx.clientId} -- ` : '';\n  console.log(`[river:${color}${level}\\u001b[0m] ${from}${msg}`);\n};\n\nexport const jsonLogger: LogFn = (msg, ctx, level) => {\n  console.log(JSON.stringify({ msg, ctx, level }));\n};\n\nexport const createLogProxy = (log: Logger) => ({\n  debug: cleanedLogFn(log.debug.bind(log)),\n  info: cleanedLogFn(log.info.bind(log)),\n  warn: cleanedLogFn(log.warn.bind(log)),\n  error: cleanedLogFn(log.error.bind(log)),\n});\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACCA,iBAA+B;AAwGxB,IAAM,eAAsB,CAAC,KAAK,KAAK,QAAQ,WAAW;AAC/D,QAAM,OAAO,KAAK,WAAW,GAAG,IAAI,QAAQ,SAAS;AACrD,UAAQ,IAAI,UAAU,KAAK,KAAK,IAAI,GAAG,GAAG,EAAE;AAC9C;AAEA,IAAM,WAAW;AAAA,EACf,OAAO;AAAA,EACP,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AACT;AAEO,IAAM,sBAA6B,CAAC,KAAK,KAAK,QAAQ,WAAW;AACtE,QAAM,QAAQ,SAAS,KAAK;AAC5B,QAAM,OAAO,KAAK,WAAW,GAAG,IAAI,QAAQ,SAAS;AACrD,UAAQ,IAAI,UAAU,KAAK,GAAG,KAAK,YAAc,IAAI,GAAG,GAAG,EAAE;AAC/D;AAEO,IAAM,aAAoB,CAAC,KAAK,KAAK,UAAU;AACpD,UAAQ,IAAI,KAAK,UAAU,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;AACjD;","names":[]}

package/dist/logging/index.d.cts

@@ -1,4 +1,3 @@
-export { h as LogFn, L as Logger, M as MessageMetadata, l as coloredStringLogger, m as jsonLogger, s as stringLogger } from '../message-3def9ded.js';
-import '@sinclair/typebox/value';
+export { h as LogFn, L as Logger, M as MessageMetadata, l as coloredStringLogger, m as jsonLogger, s as stringLogger } from '../message-865bba35.js';
 import '@sinclair/typebox';
 import '@opentelemetry/api';

package/dist/logging/index.d.ts

@@ -1,4 +1,3 @@
-export { h as LogFn, L as Logger, M as MessageMetadata, l as coloredStringLogger, m as jsonLogger, s as stringLogger } from '../message-3def9ded.js';
-import '@sinclair/typebox/value';
+export { h as LogFn, L as Logger, M as MessageMetadata, l as coloredStringLogger, m as jsonLogger, s as stringLogger } from '../message-865bba35.js';
 import '@sinclair/typebox';
 import '@opentelemetry/api';

package/dist/logging/index.js

@@ -2,7 +2,7 @@ import {
   coloredStringLogger,
   jsonLogger,
   stringLogger
-} from "../chunk-WBGKPIFS.js";
+} from "../chunk-CC7RN7GI.js";
 export {
   coloredStringLogger,
   jsonLogger,

package/dist/{message-3def9ded.d.ts → message-865bba35.d.ts}

@@ -1,4 +1,3 @@
-import { ValueError } from '@sinclair/typebox/value';
 import * as _sinclair_typebox from '@sinclair/typebox';
 import { TSchema } from '@sinclair/typebox';
 import { Span, Context } from '@opentelemetry/api';
@@ -22,7 +21,10 @@ type MessageMetadata = Partial<{
     sessionId: string;
     connId: string;
     transportMessage: Partial<OpaqueTransportMessage>;
-    validationErrors: Array<ValueError>;
+    validationErrors: Array<{
+        path: string;
+        message: string;
+    }>;
     tags: Array<Tags>;
     telemetry: {
         traceId: string;

package/dist/router/index.cjs

@@ -54,6 +54,21 @@ var ErrResultSchema = (t) => import_typebox.Type.Object({
   ok: import_typebox.Type.Literal(false),
   payload: t
 });
+var ValidationErrorDetails = import_typebox.Type.Object({
+  path: import_typebox.Type.String(),
+  message: import_typebox.Type.String()
+});
+var ValidationErrors = import_typebox.Type.Array(ValidationErrorDetails);
+function castTypeboxValueErrors(errors) {
+  const result = [];
+  for (const error of errors) {
+    result.push({
+      path: error.path,
+      message: error.message
+    });
+  }
+  return result;
+}
 var ReaderErrorSchema = import_typebox.Type.Union([
   import_typebox.Type.Object({
     code: import_typebox.Type.Literal(UNCAUGHT_ERROR_CODE),
@@ -65,7 +80,13 @@ var ReaderErrorSchema = import_typebox.Type.Union([
   }),
   import_typebox.Type.Object({
     code: import_typebox.Type.Literal(INVALID_REQUEST_CODE),
-    message: import_typebox.Type.String()
+    message: import_typebox.Type.String(),
+    extras: import_typebox.Type.Optional(
+      import_typebox.Type.Object({
+        firstValidationErrors: import_typebox.Type.Array(ValidationErrorDetails),
+        totalErrors: import_typebox.Type.Number()
+      })
+    )
   }),
   import_typebox.Type.Object({
     code: import_typebox.Type.Literal(CANCEL_CODE),
@@ -1370,25 +1391,32 @@ var RiverServer = class {
       let validationErrors;
       let errMessage;
       if ("requestData" in procedure) {
-        errMessage = "expected requestData or control payload";
-        validationErrors = [
-          ...import_value2.Value.Errors(procedure.responseData, msg.payload)
-        ];
+        errMessage = "message in requestData position did not match schema";
+        validationErrors = castTypeboxValueErrors(
+          import_value2.Value.Errors(procedure.requestData, msg.payload)
+        );
       } else {
-        validationErrors = [
-          ...import_value2.Value.Errors(ControlMessagePayloadSchema, msg.payload)
-        ];
-        errMessage = "expected control payload";
+        validationErrors = castTypeboxValueErrors(
+          import_value2.Value.Errors(ControlMessagePayloadSchema, msg.payload)
+        );
+        errMessage = "message in control payload position did not match schema";
       }
       this.log?.warn(errMessage, {
         ...loggingMetadata,
         transportMessage: msg,
-        validationErrors,
+        validationErrors: validationErrors.map((error) => ({
+          path: error.path,
+          message: error.message
+        })),
         tags: ["invalid-request"]
       });
       onServerCancel({
         code: INVALID_REQUEST_CODE,
-        message: errMessage
+        message: errMessage,
+        extras: {
+          totalErrors: validationErrors.length,
+          firstValidationErrors: validationErrors.slice(0, 5)
+        }
       });
     };
     const finishedController = new AbortController();
@@ -1858,7 +1886,7 @@ function createServerHandshakeOptions(schema, validate) {
 }
 
 // package.json
-var version = "0.205.0";
+var version = "0.205.2";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CANCEL_CODE,