More simplify

Author: timfish

packages/core/src/baseclient.ts

@@ -281,7 +281,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
       const env = createEventEnvelope(event, this._dsn, this._options._metadata, this._options.tunnel);
 
       for (const attachment of attachments || []) {
-        addItemToEnvelope(env, createAttachmentEnvelopeItem(attachment));
+        addItemToEnvelope(env, createAttachmentEnvelopeItem(attachment, this._options.transportOptions?.textEncoder));
       }
 
       this._sendEnvelope(env);

packages/core/src/transports/base.ts

@@ -69,7 +69,7 @@ export function createTransport(
     };
 
     const requestTask = (): PromiseLike<void> =>
-      makeRequest({ body: (options.serializeEnvelope || serializeEnvelope)(filteredEnvelope) }).then(
+      makeRequest({ body: serializeEnvelope(filteredEnvelope, options.textEncoder) }).then(
         ({ headers }): void => {
           if (headers) {
             rateLimits = updateRateLimits(rateLimits, headers);

packages/node/src/client.ts

@@ -3,6 +3,7 @@ import { SessionFlusher } from '@sentry/hub';
 import { Attachment, Event, EventHint, Severity, SeverityLevel } from '@sentry/types';
 import { basename, logger, resolvedSyncPromise } from '@sentry/utils';
 import { existsSync, readFileSync } from 'fs';
+import { TextEncoder } from 'util';
 
 import { eventFromMessage, eventFromUnknownInput } from './eventbuilder';
 import { IS_DEBUG_BUILD } from './flags';
@@ -34,6 +35,11 @@ export class NodeClient extends BaseClient<NodeClientOptions> {
       version: SDK_VERSION,
     };
 
+    options.transportOptions = {
+      textEncoder: new TextEncoder(),
+      ...options.transportOptions,
+    };
+
     super(options);
   }
 

packages/node/src/transports/http.ts

@@ -6,7 +6,6 @@ import {
   TransportRequest,
   TransportRequestExecutor,
 } from '@sentry/types';
-import { serializeEnvelope } from '@sentry/utils';
 import * as http from 'http';
 import * as https from 'https';
 import { Readable, Writable } from 'stream';
@@ -46,8 +45,6 @@ function streamFromBody(body: Uint8Array | string): Readable {
  * Creates a Transport that uses native the native 'http' and 'https' modules to send events to Sentry.
  */
 export function makeNodeTransport(options: NodeTransportOptions): Transport {
-  options.serializeEnvelope = s => serializeEnvelope(s, () => new TextEncoder());
-
   const urlSegments = new URL(options.url);
   const isHttps = urlSegments.protocol === 'https:';
 

packages/node/test/transports/http.test.ts

@@ -67,7 +67,7 @@ const EVENT_ENVELOPE = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4b
   [{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }] as EventItem,
 ]);
 
-const SERIALIZED_EVENT_ENVELOPE = serializeEnvelope(EVENT_ENVELOPE, () => new TextEncoder());
+const SERIALIZED_EVENT_ENVELOPE = serializeEnvelope(EVENT_ENVELOPE, new TextEncoder());
 
 const defaultOptions = {
   url: TEST_SERVER_URL,

packages/node/test/transports/https.test.ts

@@ -70,7 +70,7 @@ const EVENT_ENVELOPE = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4b
   [{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }] as EventItem,
 ]);
 
-const SERIALIZED_EVENT_ENVELOPE = serializeEnvelope(EVENT_ENVELOPE, () => new TextEncoder());
+const SERIALIZED_EVENT_ENVELOPE = serializeEnvelope(EVENT_ENVELOPE, new TextEncoder());
 
 const unsafeHttpsModule: HTTPModule = {
   request: jest

packages/types/src/envelope.ts

@@ -51,11 +51,8 @@ type SessionItemHeaders = { type: 'session' };
 type SessionAggregatesItemHeaders = { type: 'sessions' };
 type ClientReportItemHeaders = { type: 'client_report' };
 
-// TODO(v7): Remove the string union from `Event | string`
-// We have to allow this hack for now as we pre-serialize events because we support
-// both store and envelope endpoints.
-export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event | string>;
-export type AttachmentItem = BaseEnvelopeItem<AttachmentItemHeaders, Uint8Array>;
+export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
+export type AttachmentItem = BaseEnvelopeItem<AttachmentItemHeaders, string | Uint8Array>;
 export type UserFeedbackItem = BaseEnvelopeItem<UserFeedbackItemHeaders, UserFeedback>;
 export type SessionItem =
   | BaseEnvelopeItem<SessionItemHeaders, Session>

packages/types/src/transport.ts

@@ -14,10 +14,15 @@ export type TransportMakeRequestResponse = {
   };
 };
 
+// Combination of global TextEncoder and Node require('util').TextEncoder
+interface TextEncoderInternal extends TextEncoderCommon {
+  encode(input?: string): Uint8Array;
+}
+
 export interface InternalBaseTransportOptions {
   bufferSize?: number;
   recordDroppedEvent: (reason: EventDropReason, dataCategory: DataCategory) => void;
-  serializeEnvelope?: (env: Envelope) => string | Uint8Array;
+  textEncoder?: TextEncoderInternal;
 }
 
 export interface BaseTransportOptions extends InternalBaseTransportOptions {

packages/utils/src/envelope.ts

@@ -34,17 +34,6 @@ export function forEachEnvelopeItem<E extends Envelope>(
   });
 }
 
-// Cached UTF8 string encoder
-let encoder: TextEncoder | undefined;
-
-function getCachedEncoder(): TextEncoder {
-  if (!encoder) {
-    encoder = new TextEncoder();
-  }
-
-  return encoder;
-}
-
 // Combination of global TextEncoder and Node require('util').TextEncoder
 interface TextEncoderInternal extends TextEncoderCommon {
   encode(input?: string): Uint8Array;
@@ -53,11 +42,8 @@ interface TextEncoderInternal extends TextEncoderCommon {
 /**
  * Serializes an envelope.
  */
-export function serializeEnvelope(
-  envelope: Envelope,
-  textEncoderOverride?: () => TextEncoderInternal,
-): string | Uint8Array {
-  const textEncoder = textEncoderOverride || getCachedEncoder;
+export function serializeEnvelope(envelope: Envelope, textEncoder?: TextEncoderInternal): string | Uint8Array {
+  const utf8 = textEncoder || new TextEncoder();
 
   const [envHeaders, items] = envelope;
 
@@ -69,10 +55,10 @@ export function serializeEnvelope(
       if (typeof next === 'string') {
         parts += next;
       } else {
-        parts = [textEncoder().encode(parts), next];
+        parts = [utf8.encode(parts), next];
       }
     } else {
-      parts.push(typeof next === 'string' ? textEncoder().encode(next) : next);
+      parts.push(typeof next === 'string' ? utf8.encode(next) : next);
     }
   }
 
@@ -103,8 +89,12 @@ function concatBuffers(buffers: Uint8Array[]): Uint8Array {
 /**
  * Creates attachment envelope items
  */
-export function createAttachmentEnvelopeItem(attachment: Attachment): AttachmentItem {
-  const buffer = typeof attachment.data === 'string' ? new TextEncoder().encode(attachment.data) : attachment.data;
+export function createAttachmentEnvelopeItem(
+  attachment: Attachment,
+  textEncoder?: TextEncoderInternal,
+): AttachmentItem {
+  const utf8 = textEncoder || new TextEncoder();
+  const buffer = typeof attachment.data === 'string' ? utf8.encode(attachment.data) : attachment.data;
 
   return [
     {