@tachybase/module-multi-app 1.6.0 → 1.6.2

package/dist/node_modules/mariadb/lib/cmd/column-definition.js

@@ -1,35 +1,40 @@
+//  SPDX-License-Identifier: LGPL-2.1-or-later
+//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+
 'use strict';
 
 const Collations = require('../const/collations.js');
 const FieldType = require('../const/field-type');
+const FieldDetails = require('../const/field-detail');
 const Capabilities = require('../const/capabilities');
 
+// noinspection JSBitwiseOperatorUsage
 /**
  * Column definition
  * see https://mariadb.com/kb/en/library/resultset/#column-definition-packet
  */
 class ColumnDef {
-  constructor(packet, info) {
-    this._parse = new StringParser(packet);
-    if (info.serverCapabilities & Capabilities.MARIADB_CLIENT_EXTENDED_TYPE_INFO) {
-      const subPacket = packet.subPacketLengthEncoded();
-      while (subPacket.remaining()) {
-        switch (subPacket.readUInt8()) {
-          case 0:
-            this.dataTypeName = subPacket.readAsciiStringLengthEncoded();
-            break;
-
-          case 1:
-            this.dataTypeFormat = subPacket.readAsciiStringLengthEncoded();
-            break;
-
-          default:
-            // skip data
-            const len = subPacket.readUnsignedLength();
-            if (len) {
-              subPacket.skip(len);
-            }
-            break;
+  #stringParser;
+  constructor(packet, info, skipName) {
+    this.#stringParser = skipName ? new StringParser(packet) : new StringParserWithName(packet);
+    if (info.clientCapabilities & Capabilities.MARIADB_CLIENT_EXTENDED_METADATA) {
+      const len = packet.readUnsignedLength();
+      if (len > 0) {
+        const subPacket = packet.subPacketLengthEncoded(len);
+        while (subPacket.remaining()) {
+          switch (subPacket.readUInt8()) {
+            case 0:
+              this.dataTypeName = subPacket.readAsciiStringLengthEncoded();
+              break;
+
+            case 1:
+              this.dataTypeFormat = subPacket.readAsciiStringLengthEncoded();
+              break;
+
+            default:
+              subPacket.skip(subPacket.readUnsignedLength());
+              break;
+          }
         }
       }
     }
@@ -43,59 +48,152 @@ class ColumnDef {
     this.type = FieldType.TYPES[this.columnType];
   }
 
+  __getDefaultGeomVal() {
+    if (this.dataTypeName) {
+      switch (this.dataTypeName) {
+        case 'point':
+          return { type: 'Point' };
+        case 'linestring':
+          return { type: 'LineString' };
+        case 'polygon':
+          return { type: 'Polygon' };
+        case 'multipoint':
+          return { type: 'MultiPoint' };
+        case 'multilinestring':
+          return { type: 'MultiLineString' };
+        case 'multipolygon':
+          return { type: 'MultiPolygon' };
+        default:
+          return { type: this.dataTypeName };
+      }
+    }
+    return null;
+  }
+
   db() {
-    return this._parse.packet.readString(this._parse.dbOffset, this._parse.dbLength);
+    return this.#stringParser.db();
   }
 
   schema() {
-    return this._parse.packet.readString(this._parse.dbOffset, this._parse.dbLength);
+    return this.#stringParser.schema();
   }
 
   table() {
-    return this._parse.packet.readString(this._parse.tableOffset, this._parse.tableLength);
+    return this.#stringParser.table();
   }
 
   orgTable() {
-    return this._parse.packet.readString(this._parse.orgTableOffset, this._parse.orgTableLength);
+    return this.#stringParser.orgTable();
   }
 
   name() {
-    return this._parse.packet.readString(this._parse.nameOffset, this._parse.nameLength);
+    return this.#stringParser.name();
   }
 
   orgName() {
-    return this._parse.packet.readString(this._parse.orgNameOffset, this._parse.orgNameLength);
+    return this.#stringParser.orgName();
+  }
+
+  signed() {
+    return (this.flags & FieldDetails.UNSIGNED) === 0;
+  }
+
+  isSet() {
+    return (this.flags & FieldDetails.SET) !== 0;
   }
 }
 
 /**
  * String parser.
- * This object permits to avoid listing all private information to metadata object.
+ * This object permits avoiding listing all private information to a metadata object.
  */
-class StringParser {
-  constructor(packet) {
-    packet.skip(4); // skip 'def'
 
-    this.dbLength = packet.readUnsignedLength();
-    this.dbOffset = packet.pos;
-    packet.skip(this.dbLength);
+class BaseStringParser {
+  constructor(encoding, readFct, saveBuf, initialPos) {
+    this.buf = saveBuf;
+    this.encoding = encoding;
+    this.readString = readFct;
+    this.initialPos = initialPos;
+  }
+
+  _readIdentifier(skip) {
+    let pos = this.initialPos;
+    while (skip-- > 0) {
+      const type = this.buf[pos++];
+      pos += type < 0xfb ? type : 2 + this.buf[pos] + this.buf[pos + 1] * 2 ** 8;
+    }
+
+    const type = this.buf[pos++];
+    const len = type < 0xfb ? type : this.buf[pos++] + this.buf[pos++] * 2 ** 8;
+
+    return this.readString(this.encoding, this.buf, pos, len);
+  }
+
+  name() {
+    return this._readIdentifier(3);
+  }
+
+  db() {
+    let pos = this.initialPos;
+    return this.readString(this.encoding, this.buf, pos + 1, this.buf[pos]);
+  }
+
+  schema() {
+    return this.db();
+  }
+
+  table() {
+    let pos = this.initialPos + 1 + this.buf[this.initialPos];
 
-    this.tableLength = packet.readUnsignedLength();
-    this.tableOffset = packet.pos;
-    packet.skip(this.tableLength);
+    const type = this.buf[pos++];
+    const len = type < 0xfb ? type : this.buf[pos++] + this.buf[pos++] * 2 ** 8;
+    return this.readString(this.encoding, this.buf, pos, len);
+  }
 
-    this.orgTableLength = packet.readUnsignedLength();
-    this.orgTableOffset = packet.pos;
-    packet.skip(this.orgTableLength);
+  orgTable() {
+    return this._readIdentifier(2);
+  }
 
-    this.nameLength = packet.readUnsignedLength();
-    this.nameOffset = packet.pos;
-    packet.skip(this.nameLength);
+  orgName() {
+    return this._readIdentifier(4);
+  }
+}
 
-    this.orgNameLength = packet.readUnsignedLength();
-    this.orgNameOffset = packet.pos;
-    packet.skip(this.orgNameLength);
-    this.packet = packet;
+class StringParser extends BaseStringParser {
+  constructor(packet) {
+    packet.skip(packet.readUInt8()); //catalog
+    const initPos = packet.pos;
+    packet.skip(packet.readUInt8()); //schema
+    packet.skip(packet.readMetadataLength()); //table alias
+    packet.skip(packet.readUInt8()); //table
+    packet.skip(packet.readMetadataLength()); //column alias
+    packet.skip(packet.readUInt8()); //column
+
+    super(packet.encoding, packet.constructor.readString, packet.buf, initPos);
+  }
+}
+
+/**
+ * String parser.
+ * This object permits to avoid listing all private information to metadata object.
+ */
+class StringParserWithName extends BaseStringParser {
+  colName;
+  constructor(packet) {
+    packet.skip(packet.readUInt8()); //catalog
+    const initPos = packet.pos;
+    packet.skip(packet.readUInt8()); //schema
+    packet.skip(packet.readMetadataLength()); //table alias
+    packet.skip(packet.readUInt8()); //table
+    const colName = packet.readStringLengthEncoded(); //column alias
+    packet.skip(packet.readUInt8()); //column
+
+    super(packet.encoding, packet.constructor.readString, packet.buf, initPos);
+    this.colName = colName;
+  }
+
+  name() {
+    return this.colName;
   }
 }
 

package/dist/node_modules/mariadb/lib/cmd/command.js

@@ -1,23 +1,24 @@
+//  SPDX-License-Identifier: LGPL-2.1-or-later
+//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+
 'use strict';
 
 const EventEmitter = require('events');
 const Errors = require('../misc/errors');
-const ServerStatus = require('../const/server-status');
-const StateChange = require('../const/state-change');
-const Collations = require('../const/collations');
-const OkPacket = require('./class/ok-packet');
 
 /**
  * Default command interface.
  */
 class Command extends EventEmitter {
-  constructor(resolve, reject) {
+  constructor(cmdParam, resolve, reject) {
     super();
+    this.cmdParam = cmdParam;
     this.sequenceNo = -1;
     this.compressSequenceNo = -1;
     this.resolve = resolve;
     this.reject = reject;
     this.sending = false;
+    this.unexpectedError = this.throwUnexpectedError.bind(this);
   }
 
   displaySql() {
@@ -25,7 +26,7 @@ class Command extends EventEmitter {
   }
 
   /**
-   * Throw an an unexpected error.
+   * Throw an unexpected error.
    * server exchange will still be read to keep connection in a good state, but promise will be rejected.
    *
    * @param msg message
@@ -35,14 +36,22 @@ class Command extends EventEmitter {
    * @param errno error number
    */
   throwUnexpectedError(msg, fatal, info, sqlState, errno) {
+    const err = Errors.createError(
+      msg,
+      errno,
+      info,
+      sqlState,
+      this.opts && this.opts.logParam ? this.displaySql() : this.sql,
+      fatal,
+      this.cmdParam ? this.cmdParam.stack : null,
+      false
+    );
     if (this.reject) {
-      process.nextTick(
-        this.reject,
-        Errors.createError(msg, this.displaySql(), fatal, info, sqlState, errno, this.stack, false)
-      );
+      process.nextTick(this.reject, err);
       this.resolve = null;
       this.reject = null;
     }
+    return err;
   }
 
   /**
@@ -57,15 +66,23 @@ class Command extends EventEmitter {
    */
   throwNewError(msg, fatal, info, sqlState, errno) {
     this.onPacketReceive = null;
-    if (this.reject) {
-      process.nextTick(
-        this.reject,
-        Errors.createError(msg, this.displaySql(), fatal, info, sqlState, errno, this.stack, false)
-      );
-      this.resolve = null;
-      this.reject = null;
-    }
+    const err = this.throwUnexpectedError(msg, fatal, info, sqlState, errno);
     this.emit('end');
+    return err;
+  }
+
+  /**
+   * When command cannot be sent due to error.
+   * (this is only on start command)
+   *
+   * @param msg error message
+   * @param errno error number
+   * @param info connection information
+   */
+  sendCancelled(msg, errno, info) {
+    const err = Errors.createError(msg, errno, info, 'HY000', this.opts.logParam ? this.displaySql() : this.sql);
+    this.emit('send_end');
+    this.throwError(err, info);
   }
 
   /**
@@ -78,15 +95,15 @@ class Command extends EventEmitter {
   throwError(err, info) {
     this.onPacketReceive = null;
     if (this.reject) {
-      if (this.stack) {
+      if (this.cmdParam && this.cmdParam.stack) {
         err = Errors.createError(
-          err.message,
-          err.sql,
-          err.fatal,
+          err.text ? err.text : err.message,
+          err.errno,
           info,
           err.sqlState,
-          err.errno,
-          this.stack,
+          err.sql,
+          err.fatal,
+          this.cmdParam.stack,
           false
         );
       }
@@ -112,57 +129,6 @@ class Command extends EventEmitter {
     }
     this.emit('end');
   }
-
-  parseOkPacket(packet, out, opts, info) {
-    packet.skip(1); //skip header
-
-    const affectedRows = packet.readUnsignedLength();
-    const insertId = opts.supportBigInt
-      ? packet.readSignedLengthBigInt()
-      : packet.readSignedLength();
-
-    info.status = packet.readUInt16();
-
-    const okPacket = new OkPacket(affectedRows, insertId, packet.readUInt16());
-
-    if (info.status & ServerStatus.SESSION_STATE_CHANGED) {
-      packet.skipLengthCodedNumber();
-      while (packet.remaining()) {
-        const subPacket = packet.subPacketLengthEncoded();
-        while (subPacket.remaining()) {
-          const type = subPacket.readUInt8();
-          switch (type) {
-            case StateChange.SESSION_TRACK_SYSTEM_VARIABLES:
-              const subSubPacket = subPacket.subPacketLengthEncoded();
-              const variable = subSubPacket.readStringLength();
-              const value = subSubPacket.readStringLength();
-
-              switch (variable) {
-                case 'character_set_client':
-                  opts.collation = Collations.fromCharset(value);
-                  if (opts.collation === undefined) {
-                    this.throwError(new Error("unknown charset : '" + value + "'"), info);
-                    return;
-                  }
-                  opts.emit('collation', opts.collation);
-                  break;
-
-                default:
-                //variable not used by driver
-              }
-              break;
-
-            case StateChange.SESSION_TRACK_SCHEMA:
-              const subSubPacket2 = subPacket.subPacketLengthEncoded();
-              info.database = subSubPacket2.readStringLength();
-              break;
-          }
-        }
-      }
-    }
-
-    return okPacket;
-  }
 }
 
 module.exports = Command;