Revert "fix(client): use http2"

This reverts commit 1e0910e.
prisma · May 18, 2020 · 47cbf5c · 47cbf5c
1 parent ddcc31a
commit 47cbf5c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/src/packages/client/src/runtime/getPrismaClient.ts b/src/packages/client/src/runtime/getPrismaClient.ts
@@ -628,14 +628,11 @@ export class PrismaClientFetcher {
     }
     try {
       collectTimestamps && collectTimestamps.record('Pre-engine_request')
-      const { data, elapsed } = await this.dataloader.request({ document })
+      const result = await this.dataloader.request({ document })
       collectTimestamps && collectTimestamps.record('Post-engine_request')
       collectTimestamps && collectTimestamps.record('Pre-unpack')
-      const unpackResult = this.unpack(document, data, dataPath, rootField)
+      const unpackResult = this.unpack(document, result, dataPath, rootField)
       collectTimestamps && collectTimestamps.record('Post-unpack')
-      if (process.env.PRISMA_CLIENT_GET_TIME) {
-        return { data: unpackResult, elapsed }
-      }
       return unpackResult
     } catch (e) {
       let message = e.message

diff --git a/src/packages/engine-core/src/NodeEngine.ts b/src/packages/engine-core/src/NodeEngine.ts
@@ -22,7 +22,7 @@ import { convertLog, RustLog, RustError } from './log'
 import { spawn, ChildProcessWithoutNullStreams } from 'child_process'
 import byline from './byline'
 import bent from 'bent'
-import { Client } from './client'
+import { getLogs } from '@prisma/debug'
 
 const debug = debugLib('engine')
 const exists = promisify(fs.exists)
@@ -86,7 +86,6 @@ export class NodeEngine {
   private debug: boolean
   private child?: ChildProcessWithoutNullStreams
   private clientVersion?: string
-  private client?: Client
   exitCode: number
   /**
    * exiting is used to tell the .on('exit') hook, if the exit came from our script.
@@ -610,7 +609,7 @@ ${this.lastErrorLog.fields.file}:${this.lastErrorLog.fields.line}:${this.lastErr
         const url = `http://localhost:${this.port}`
         this.url = url
         // TODO: Re-enable
-        this.client = new Client(url)
+        // this.client = new Client(url)
         resolve()
       } catch (e) {
         reject(e)
@@ -694,25 +693,19 @@ ${this.lastErrorLog.fields.file}:${this.lastErrorLog.fields.line}:${this.lastErr
       variables,
     }
 
-    // this.currentRequestPromise = curly.post(this.url, {
-    //   post: true,
-    //   postFields: JSON.stringify(body),
-    //   httpHeader: ['Content-Type: application/json'],
-    // })
-
-    this.currentRequestPromise = this.client!.request(body)
+    const post = bent(this.url, 'POST', 'json', 200)
+    this.currentRequestPromise = post('/', body)
 
     return this.currentRequestPromise
-      .then(({ data, statusCode, headers }) => {
+      .then((data) => {
         if (data.errors) {
           if (data.errors.length === 1) {
             throw this.graphQLToJSError(data.errors[0])
           }
           throw new Error(JSON.stringify(data.errors))
         }
-        const elapsed = parseInt(headers['x-elapsed']) / 1000
 
-        return { data, elapsed }
+        return data
       })
       .catch((error) => {
         debug({ error })

diff --git a/src/packages/engine-core/src/client.ts b/src/packages/engine-core/src/client.ts
@@ -4,17 +4,15 @@ import { PrismaQueryEngineError } from './Engine'
 export class Client {
   private session: http2.ClientHttp2Session
   constructor(url: string) {
-    this.session = http2.connect(url, {
-      maxSessionMemory: 50,
-    })
+    this.session = http2.connect(url, {})
 
     // necessary to disable Node.js' error handling and us handle the error in .on('error') of the session
     this.session.on('error', () => {}) // eslint-disable-line @typescript-eslint/no-empty-function
   }
   close(): void {
     this.session.destroy()
   }
-  request(body: any): Promise<{ data: any; headers: any }> {
+  request(body: any): Promise<unknown> {
     return new Promise((resolve, reject) => {
       try {
         let rejected = false
@@ -24,9 +22,9 @@ export class Client {
         const req = this.session.request({
           [http2.constants.HTTP2_HEADER_METHOD]:
             http2.constants.HTTP2_METHOD_POST,
+          [http2.constants.HTTP2_HEADER_PATH]: `/`,
           'Content-Type': 'application/json',
           'Content-Length': buffer.length,
-          'Accept-Encoding': '*',
         })
 
         req.setEncoding('utf8')
@@ -79,8 +77,7 @@ export class Client {
 
         req.on('end', () => {
           if (data && data.length > 0 && !rejected) {
-            // console.log(headers)
-            resolve({ data: JSON.parse(data.join('')), headers })
+            resolve({ body: JSON.parse(data.join('')), headers })
           }
         })
       } catch (e) {