addString32 to writer

splitice · splitice · commit 9a94fe935d19 · 2025-09-04T12:52:08.000+10:00
diff --git a/packages/pg-protocol/src/buffer-writer.ts b/packages/pg-protocol/src/buffer-writer.ts
@@ -58,6 +58,18 @@ export class Writer {
     return this
   }
 
+  public addString32(string: string = ''): Writer {
+    let len = Buffer.byteLength(string)
+    this.ensure(len + 4)
+    this.buffer[this.offset++] = (len >>> 24) & 0xff
+    this.buffer[this.offset++] = (len >>> 16) & 0xff
+    this.buffer[this.offset++] = (len >>> 8) & 0xff
+    this.buffer[this.offset++] = (len >>> 0) & 0xff
+    this.buffer.write(string, this.offset)
+    this.offset += len
+    return this
+  }
+
   public add(otherBuffer: Buffer): Writer {
     this.ensure(otherBuffer.length)
     otherBuffer.copy(this.buffer, this.offset)
diff --git a/packages/pg-protocol/src/serializer.ts b/packages/pg-protocol/src/serializer.ts
@@ -48,7 +48,7 @@ const password = (password: string): Buffer => {
 
 const sendSASLInitialResponseMessage = function (mechanism: string, initialResponse: string): Buffer {
   // 0x70 = 'p'
-  writer.addCString(mechanism).addInt32(Buffer.byteLength(initialResponse)).addString(initialResponse)
+  writer.addCString(mechanism).addString32(initialResponse)
 
   return writer.flush(code.startup)
 }
@@ -137,8 +137,7 @@ const writeValues = function (values: any[], valueMapper?: ValueMapper): void {
     } else {
       // add the param type (string) to the writer
       writer.addInt16(ParamType.STRING)
-      paramWriter.addInt32(Buffer.byteLength(mappedVal))
-      paramWriter.addString(mappedVal)
+      paramWriter.addString32(mappedVal)
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ const password = (password: string): Buffer => {`
`48`	`48`
`49`	`49`	`const sendSASLInitialResponseMessage = function (mechanism: string, initialResponse: string): Buffer {`
`50`	`50`	`// 0x70 = 'p'`
`51`		`- writer.addCString(mechanism).addInt32(Buffer.byteLength(initialResponse)).addString(initialResponse)`
	`51`	`+ writer.addCString(mechanism).addString32(initialResponse)`
`52`	`52`
`53`	`53`	`return writer.flush(code.startup)`
`54`	`54`	`}`
`@@ -137,8 +137,7 @@ const writeValues = function (values: any[], valueMapper?: ValueMapper): void {`
`137`	`137`	`} else {`
`138`	`138`	`// add the param type (string) to the writer`
`139`	`139`	`writer.addInt16(ParamType.STRING)`
`140`		`- paramWriter.addInt32(Buffer.byteLength(mappedVal))`
`141`		`- paramWriter.addString(mappedVal)`
	`140`	`+ paramWriter.addString32(mappedVal)`
`142`	`141`	`}`
`143`	`142`	`}`
`144`	`143`	`}`