@tachybase/module-multi-app 1.6.0 → 1.6.1

package/dist/node_modules/mariadb/lib/io/packet-input-stream.js

@@ -1,8 +1,11 @@
+//  SPDX-License-Identifier: LGPL-2.1-or-later
+//  Copyright (c) 2015-2025 MariaDB Corporation Ab
+
 'use strict';
 
 const PacketNodeEncoded = require('./packet-node-encoded');
 const PacketIconvEncoded = require('./packet-node-iconv');
-
+const Collations = require('../const/collations');
 const Utils = require('../misc/utils');
 
 /**
@@ -25,63 +28,39 @@ class PacketInputStream {
 
     this.parts = null;
     this.partsTotalLen = 0;
-    this.changeEncoding(this.opts.collation);
-    this.changeDebug(this.opts.logPackets, this.opts.debug);
+    this.changeEncoding(this.opts.collation ? this.opts.collation : Collations.fromIndex(224));
+    this.changeDebug(this.opts.debug);
     this.opts.on('collation', this.changeEncoding.bind(this));
     this.opts.on('debug', this.changeDebug.bind(this));
   }
 
   changeEncoding(collation) {
     this.encoding = collation.charset;
-    this.packetConstructor = Buffer.isEncoding(this.encoding)
-      ? PacketNodeEncoded
-      : PacketIconvEncoded;
+    this.packet = Buffer.isEncoding(this.encoding)
+      ? new PacketNodeEncoded(this.encoding)
+      : new PacketIconvEncoded(this.encoding);
   }
 
-  changeDebug(logPackets, debug) {
-    this.logPackets = logPackets;
-    this.debug = debug;
-    this.receivePacket =
-      this.logPackets || this.debug ? this.receivePacketDebug : this.receivePacketBasic;
+  changeDebug(debug) {
+    this.receivePacket = debug ? this.receivePacketDebug : this.receivePacketBasic;
   }
 
   receivePacketDebug(packet) {
     let cmd = this.currentCmd();
-
+    this.header[0] = this.packetLen;
+    this.header[1] = this.packetLen >> 8;
+    this.header[2] = this.packetLen >> 16;
+    this.header[3] = this.sequenceNo;
     if (packet) {
-      const packetStr = Utils.log(this.opts, packet.buf, packet.pos, packet.end, this.header);
-      if (this.opts.logPackets) {
-        this.info.addPacket(
-          '<== conn:' +
-            (this.info.threadId ? this.info.threadId : -1) +
-            ' ' +
-            (cmd
-              ? cmd.onPacketReceive
-                ? cmd.constructor.name + '.' + cmd.onPacketReceive.name
-                : cmd.constructor.name
-              : 'no command') +
-            ' (' +
-            packet.pos +
-            ',' +
-            packet.end +
-            '))\n' +
-            packetStr
-        );
-      }
-      if (this.opts.debug) {
-        console.log(
-          '<== conn:%d %s (%d,%d)\n%s',
-          this.info.threadId ? this.info.threadId : -1,
+      this.opts.logger.network(
+        `<== conn:${this.info.threadId ? this.info.threadId : -1} ${
           cmd
             ? cmd.onPacketReceive
               ? cmd.constructor.name + '.' + cmd.onPacketReceive.name
               : cmd.constructor.name
-            : 'no command',
-          packet.pos,
-          packet.end,
-          packetStr
-        );
-      }
+            : 'no command'
+        } (${packet.pos},${packet.end})\n${Utils.log(this.opts, packet.buf, packet.pos, packet.end, this.header)}`
+      );
     }
 
     if (!cmd) {
@@ -89,9 +68,11 @@ class PacketInputStream {
       return;
     }
 
-    cmd.sequenceNo = this.header[3];
+    cmd.sequenceNo = this.sequenceNo;
     cmd.onPacketReceive(packet, this.out, this.opts, this.info);
-    if (!cmd.onPacketReceive) this.receiveQueue.shift();
+    if (!cmd.onPacketReceive) {
+      this.receiveQueue.shift();
+    }
   }
 
   receivePacketBasic(packet) {
@@ -100,7 +81,7 @@ class PacketInputStream {
       this.unexpectedPacket(packet);
       return;
     }
-    cmd.sequenceNo = this.header[3];
+    cmd.sequenceNo = this.sequenceNo;
     cmd.onPacketReceive(packet, this.out, this.opts, this.info);
     if (!cmd.onPacketReceive) this.receiveQueue.shift();
   }
@@ -129,13 +110,9 @@ class PacketInputStream {
       if (this.remainingLen) {
         length = this.remainingLen;
       } else if (this.headerLen === 0 && chunkLen - pos >= 4) {
-        this.header[0] = chunk[pos];
-        this.header[1] = chunk[pos + 1];
-        this.header[2] = chunk[pos + 2];
-        this.header[3] = chunk[pos + 3];
+        this.packetLen = chunk[pos] + (chunk[pos + 1] << 8) + (chunk[pos + 2] << 16);
+        this.sequenceNo = chunk[pos + 3];
         pos += 4;
-        this.headerLen = 4;
-        this.packetLen = this.header[0] + (this.header[1] << 8) + (this.header[2] << 16);
         length = this.packetLen;
       } else {
         length = null;
@@ -143,6 +120,7 @@ class PacketInputStream {
           this.header[this.headerLen++] = chunk[pos++];
           if (this.headerLen === 4) {
             this.packetLen = this.header[0] + (this.header[1] << 8) + (this.header[2] << 16);
+            this.sequenceNo = this.header[3];
             length = this.packetLen;
             break;
           }
@@ -151,30 +129,55 @@ class PacketInputStream {
 
       if (length) {
         if (chunkLen - pos >= length) {
-          const buf = chunk.slice(pos, pos + length);
           pos += length;
-          if (this.parts) {
-            this.parts.push(buf);
+          if (!this.parts) {
+            if (this.packetLen < 0xffffff) {
+              this.receivePacket(this.packet.update(chunk, pos - length, pos));
+              // fast path, knowing there is no parts
+              // loop can be simplified until reaching the end of the packet.
+              while (pos + 4 < chunkLen) {
+                this.packetLen = chunk[pos] + (chunk[pos + 1] << 8) + (chunk[pos + 2] << 16);
+                this.sequenceNo = chunk[pos + 3];
+                pos += 4;
+                if (chunkLen - pos >= this.packetLen) {
+                  pos += this.packetLen;
+                  if (this.packetLen < 0xffffff) {
+                    this.receivePacket(this.packet.update(chunk, pos - this.packetLen, pos));
+                  } else {
+                    this.parts = [chunk.subarray(pos - this.packetLen, pos)];
+                    this.partsTotalLen = this.packetLen;
+                    break;
+                  }
+                } else {
+                  const buf = chunk.subarray(pos, chunkLen);
+                  if (!this.parts) {
+                    this.parts = [buf];
+                    this.partsTotalLen = chunkLen - pos;
+                  } else {
+                    this.parts.push(buf);
+                    this.partsTotalLen += chunkLen - pos;
+                  }
+                  this.remainingLen = this.packetLen - (chunkLen - pos);
+                  return;
+                }
+              }
+            } else {
+              this.parts = [chunk.subarray(pos - length, pos)];
+              this.partsTotalLen = length;
+            }
+          } else {
+            this.parts.push(chunk.subarray(pos - length, pos));
             this.partsTotalLen += length;
 
             if (this.packetLen < 0xffffff) {
               let buf = Buffer.concat(this.parts, this.partsTotalLen);
               this.parts = null;
-              const packet = new this.packetConstructor(buf, 0, this.partsTotalLen, this.encoding);
-              this.receivePacket(packet);
-            }
-          } else {
-            if (this.packetLen < 0xffffff) {
-              const packet = new this.packetConstructor(buf, 0, length, this.encoding);
-              this.receivePacket(packet);
-            } else {
-              this.parts = [buf];
-              this.partsTotalLen = length;
+              this.receivePacket(this.packet.update(buf, 0, this.partsTotalLen));
             }
           }
           this.resetHeader();
         } else {
-          const buf = chunk.slice(pos, chunkLen);
+          const buf = chunk.subarray(pos, chunkLen);
           if (!this.parts) {
             this.parts = [buf];
             this.partsTotalLen = chunkLen - pos;
@@ -185,6 +188,14 @@ class PacketInputStream {
           this.remainingLen = length - (chunkLen - pos);
           return;
         }
+      } else if (length === 0 && this.parts) {
+        // ending empty packet
+        this.parts.push(chunk.subarray(pos - length, pos));
+        this.partsTotalLen += length;
+        let buf = Buffer.concat(this.parts, this.partsTotalLen);
+        this.parts = null;
+        this.receivePacket(this.packet.update(buf, 0, this.partsTotalLen));
+        this.resetHeader();
       }
     } while (pos < chunkLen);
   }

package/dist/node_modules/mariadb/lib/io/packet-node-encoded.js

@@ -1,14 +1,19 @@
+//  SPDX-License-Identifier: LGPL-2.1-or-later
+//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+
 'use strict';
 
 const Packet = require('./packet');
 
 class PacketNodeEncoded extends Packet {
-  constructor(buf, pos, end, encoding) {
-    super(buf, pos, end);
-    this.encoding = encoding;
+  constructor(encoding) {
+    super();
+    // using undefined for utf8 permit to avoid node.js searching
+    // for charset, using directly utf8 default one.
+    this.encoding = encoding === 'utf8' ? undefined : encoding;
   }
 
-  readStringLength() {
+  readStringLengthEncoded() {
     const len = this.readUnsignedLength();
     if (len === null) return null;
 
@@ -16,14 +21,13 @@ class PacketNodeEncoded extends Packet {
     return this.buf.toString(this.encoding, this.pos - len, this.pos);
   }
 
-  readString(beg, len) {
-    return this.buf.toString(this.encoding, beg, beg + len);
+  static readString(encoding, buf, beg, len) {
+    return buf.toString(encoding, beg, beg + len);
   }
 
-  subPacketLengthEncoded() {
-    const len = this.readUnsignedLength();
+  subPacketLengthEncoded(len) {
     this.skip(len);
-    return new PacketNodeEncoded(this.buf, this.pos - len, this.pos, this.encoding);
+    return new PacketNodeEncoded(this.encoding).update(this.buf, this.pos - len, this.pos);
   }
 
   readStringRemaining() {

package/dist/node_modules/mariadb/lib/io/packet-node-iconv.js

@@ -1,34 +1,36 @@
+//  SPDX-License-Identifier: LGPL-2.1-or-later
+//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+
 'use strict';
 
 const Packet = require('./packet');
 const Iconv = require('iconv-lite');
 
 class PacketIconvEncoded extends Packet {
-  constructor(buf, pos, end, encoding) {
-    super(buf, pos, end);
+  constructor(encoding) {
+    super();
     this.encoding = encoding;
   }
 
-  readStringLength() {
+  readStringLengthEncoded() {
     const len = this.readUnsignedLength();
     if (len === null) return null;
 
     this.pos += len;
-    return Iconv.decode(this.buf.slice(this.pos - len, this.pos), this.encoding);
+    return Iconv.decode(this.buf.subarray(this.pos - len, this.pos), this.encoding);
   }
 
-  readString(beg, len) {
-    return Iconv.decode(this.buf.slice(beg, beg + len), this.encoding);
+  static readString(encoding, buf, beg, len) {
+    return Iconv.decode(buf.subarray(beg, beg + len), encoding);
   }
 
-  subPacketLengthEncoded() {
-    const len = this.readUnsignedLength();
+  subPacketLengthEncoded(len) {
     this.skip(len);
-    return new PacketIconvEncoded(this.buf, this.pos - len, this.pos, this.encoding);
+    return new PacketIconvEncoded(this.encoding).update(this.buf, this.pos - len, this.pos);
   }
 
   readStringRemaining() {
-    const str = Iconv.decode(this.buf.slice(this.pos, this.end), this.encoding);
+    const str = Iconv.decode(this.buf.subarray(this.pos, this.end), this.encoding);
     this.pos = this.end;
     return str;
   }