Fix porsager#22 Use documented node buffer methods

porsager · porsager · commit 0f10e502332b · 2020-01-23T20:15:42.000+01:00
diff --git a/lib/backend.js b/lib/backend.js
@@ -66,8 +66,8 @@ function Backend({
     let index = 9
     while (x[index++] !== 0);
     onnotify(
-      x.utf8Slice(9, index - 1),
-      x.utf8Slice(index, x.length - 1)
+      x.toString('utf8', 9, index - 1),
+      x.toString('utf8', index, x.length - 1)
     )
   }
 
@@ -77,9 +77,9 @@ function Backend({
 
     for (let i = x.length - 1; i > 0; i--) {
       if (x[i] === 32 && x[i + 1] < 58 && backend.query.result.count === null)
-        backend.query.result.count = +x.utf8Slice(i + 1, x.length - 1)
+        backend.query.result.count = +x.toString('utf8', i + 1, x.length - 1)
       if (x[i - 1] >= 65) {
-        backend.query.result.command = x.utf8Slice(5, i)
+        backend.query.result.command = x.toString('utf8', 5, i)
         break
       }
     }
@@ -103,10 +103,10 @@ function Backend({
       value = length === -1
         ? null
         : column.p === undefined
-          ? x.utf8Slice(index, index += length)
+          ? x.toString('utf8', index, index += length)
           : column.p.array === true
-            ? column.p(x.utf8Slice(index + 1, index += length))
-            : column.p(x.utf8Slice(index, index += length))
+            ? column.p(x.toString('utf8', index + 1, index += length))
+            : column.p(x.toString('utf8', index, index += length))
 
       row[column.n] = transform.value ? transform.value(value) : value
     }
@@ -157,7 +157,7 @@ function Backend({
   }
 
   function ParameterStatus(x) {
-    const [k, v] = x.utf8Slice(5, x.length - 1).split(N)
+    const [k, v] = x.toString('utf8', 5, x.length - 1).split(N)
     onparameter(k, v)
   }
 
@@ -195,8 +195,8 @@ function Backend({
       while (x[index++] !== 0);
       backend.query.statement.columns[i] = {
         n: transform.column
-          ? transform.column(x.utf8Slice(start, index - 1))
-          : x.utf8Slice(start, index - 1),
+          ? transform.column(x.toString('utf8', start, index - 1))
+          : x.toString('utf8', start, index - 1),
         p: parsers[x.readInt32BE(index + 6)]
       }
       index += 18
@@ -230,7 +230,7 @@ function parseError(x) {
   let start = 5
   for (let i = 5; i < x.length - 1; i++) {
     if (x[i] === 0) {
-      error[errorFields[x[start]]] = x.utf8Slice(start + 1, i)
+      error[errorFields[x[start]]] = x.toString('utf8', start + 1, i)
       start = i + 1
     }
   }
diff --git a/lib/bytes.js b/lib/bytes.js
@@ -37,7 +37,7 @@ const b = {
   str(x) {
     const length = Buffer.byteLength(x)
     fit(length)
-    b.i += buffer.utf8Write(x, b.i, length)
+    b.i += buffer.write(x, b.i, length, 'utf8')
     return b
   },
   i16(x) {
diff --git a/lib/frontend.js b/lib/frontend.js
@@ -101,7 +101,7 @@ function SASL(type, x, options) {
 }
 
 function SASLContinue(type, x, options, pass) {
-  const res = x.utf8Slice(9).split(',').reduce((acc, x) => (acc[x[0]] = x.slice(2), acc), {})
+  const res = x.toString('utf8', 9).split(',').reduce((acc, x) => (acc[x[0]] = x.slice(2), acc), {})
 
   const saltedPassword = crypto.pbkdf2Sync(
     pass,
@@ -124,7 +124,7 @@ function SASLContinue(type, x, options, pass) {
 }
 
 function SASLFinal(type, x, options) {
-  if (x.utf8Slice(9).split(N, 1)[0].slice(2) === options.serverSignature)
+  if (x.toString('utf8', 9).split(N, 1)[0].slice(2) === options.serverSignature)
     return ''
   /* c8 ignore next 4 */
   throw errors.generic({

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ function SASL(type, x, options) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`function SASLContinue(type, x, options, pass) {`
`104`		`- const res = x.utf8Slice(9).split(',').reduce((acc, x) => (acc[x[0]] = x.slice(2), acc), {})`
	`104`	`+ const res = x.toString('utf8', 9).split(',').reduce((acc, x) => (acc[x[0]] = x.slice(2), acc), {})`
`105`	`105`
`106`	`106`	`const saltedPassword = crypto.pbkdf2Sync(`
`107`	`107`	`pass,`
`@@ -124,7 +124,7 @@ function SASLContinue(type, x, options, pass) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`function SASLFinal(type, x, options) {`
`127`		`- if (x.utf8Slice(9).split(N, 1)[0].slice(2) === options.serverSignature)`
	`127`	`+ if (x.toString('utf8', 9).split(N, 1)[0].slice(2) === options.serverSignature)`
`128`	`128`	`return ''`
`129`	`129`	`/* c8 ignore next 4 */`
`130`	`130`	`throw errors.generic({`