Merge branch 'master' of https://github.com/Logflare/pino-logflare

package.json

@@ -44,17 +44,17 @@
     "@types/pumpify": "^1.4.1",
     "@types/split2": "^2.1.6",
     "@types/through2": "^2.0.36",
-    "@typescript-eslint/eslint-plugin": "^3.4.0",
-    "@typescript-eslint/parser": "^3.4.0",
+    "@typescript-eslint/eslint-plugin": "^4.16.0",
+    "@typescript-eslint/parser": "^4.16.0",
     "eslint": "^7.3.1",
     "eslint-config-airbnb-base": "^14.2.0",
-    "eslint-config-standard": "^14.1.1",
+    "eslint-config-standard": "^16.0.0",
     "eslint-plugin-import": "^2.22.0",
     "jest": "^26.1.0",
     "jest-mock-process": "^1.4.0",
     "pino-multi-stream": "^5.0.0",
     "sinon": "^9.0.1",
-    "typescript": "^3.9.5"
+    "typescript": "^4.2.0"
   },
   "dependencies": {
     "axios": "^0.21.1",
@@ -81,4 +81,4 @@
     "doc": "docs",
     "test": "test"
   }
-}
+}

src/index.ts

@@ -1,21 +1,32 @@
 import createHttpWriteStream from "./httpStream"
 import createConsoleWriteStream from "./consoleStream"
-import {pinoBrowserLogEventI, formatPinoBrowserLogEvent, addLogflareTransformDirectives} from "./utils"
-import {LogflareHttpClient, LogflareUserOptionsI} from "logflare-transport-core"
+import {
+  LogEvent,
+  formatPinoBrowserLogEvent,
+  addLogflareTransformDirectives,
+} from "./utils"
+import {
+  LogflareHttpClient,
+  LogflareUserOptionsI,
+} from "logflare-transport-core"
 
-const isBrowser = typeof window !== 'undefined'
-  && typeof window.document !== 'undefined'
+const isBrowser =
+  typeof window !== "undefined" && typeof window.document !== "undefined"
 
-const isNode = typeof process !== 'undefined'
-  && process.versions != null
-  && process.versions.node != null
+const isNode =
+  typeof process !== "undefined" &&
+  process.versions != null &&
+  process.versions.node != null
 
 const createPinoBrowserSend = (options: LogflareUserOptionsI) => {
-  const client = new LogflareHttpClient({...options, fromBrowser: true})
+  const client = new LogflareHttpClient({ ...options, fromBrowser: true })
 
-  return (level: number, logEvent: pinoBrowserLogEventI) => {
+  return (level: string, logEvent: LogEvent) => {
     const logflareLogEvent = formatPinoBrowserLogEvent(logEvent)
-    const maybeWithTransforms = addLogflareTransformDirectives(logflareLogEvent, options)
+    const maybeWithTransforms = addLogflareTransformDirectives(
+      logflareLogEvent,
+      options
+    )
     client.postLogEvents([maybeWithTransforms])
   }
 }
@@ -29,4 +40,10 @@ const logflarePinoVercel = (options: LogflareUserOptionsI) => {
 
 const createWriteStream = createHttpWriteStream
 
-export {createWriteStream, logflarePinoVercel, createPinoBrowserSend, createConsoleWriteStream, createHttpWriteStream}
+export {
+  createWriteStream,
+  logflarePinoVercel,
+  createPinoBrowserSend,
+  createConsoleWriteStream,
+  createHttpWriteStream,
+}

src/utils.ts

@@ -18,14 +18,26 @@ function levelToStatus(level: number) {
   return "info"
 }
 
-interface pinoBrowserLogEventI {
+type Level = "fatal" | "error" | "warn" | "info" | "debug" | "trace"
+type SerializerFn = (value: any) => any
+
+interface Bindings {
+  level?: Level | string
+  serializers?: { [key: string]: SerializerFn }
+  [key: string]: any
+}
+
+interface LogEvent {
   ts: number
-  messages: string[]
-  bindings: object[]
-  level: { value: number; label: string }
+  messages: any[]
+  bindings: Bindings[]
+  level: {
+    label: string
+    value: number
+  }
 }
 
-const formatPinoBrowserLogEvent = (logEvent: pinoBrowserLogEventI) => {
+const formatPinoBrowserLogEvent = (logEvent: LogEvent) => {
   const {
     ts,
     messages,
@@ -107,6 +119,6 @@ function toLogEntry(item: Record<string, any>): Record<string, any> {
 export {
   toLogEntry,
   formatPinoBrowserLogEvent,
-  pinoBrowserLogEventI,
+  LogEvent,
   addLogflareTransformDirectives,
 }