@superhero/eventflow-db 4.2.6 → 4.3.0

package/config.js

@@ -11,21 +11,23 @@ export default
   {
     db:
     {
-      debug                 : process.env.EVENTFLOW_MYSQL_DEBUG             ?? false,
-      insecureAuth          : process.env.EVENTFLOW_MYSQL_INSECURE_AUTH     ?? false,
-      enableKeepAlive       : process.env.EVENTFLOW_MYSQL_ENABLE_KEEP_ALIVE ?? true,
-      waitForConnections    : process.env.EVENTFLOW_MYSQL_WAIT_FOR_CONN     ?? true,
-      keepAliveInitialDelay : process.env.EVENTFLOW_MYSQL_KEEP_ALIVE_DELAY  ?? '10000',
-      queueLimit            : process.env.EVENTFLOW_MYSQL_QUEUE_LIMIT       ?? '0',
-      connectionLimit       : process.env.EVENTFLOW_MYSQL_CONNECTION_LIMIT  ?? '5',
-      flags                 : process.env.EVENTFLOW_MYSQL_FLAGS             ?? '',
-      charset               : process.env.EVENTFLOW_MYSQL_CHARSET           ?? 'UTF8_GENERAL_CI',
-      timezone              : process.env.EVENTFLOW_MYSQL_TIMEZONE          ?? 'Z',
-      host                  : process.env.EVENTFLOW_MYSQL_HOST              ?? 'localhost',
-      port                  : process.env.EVENTFLOW_MYSQL_PORT              ?? '3306',
-      user                  : process.env.EVENTFLOW_MYSQL_USER              ?? 'root',
-      password              : process.env.EVENTFLOW_MYSQL_PASS              ?? 'root',
-      database              : process.env.EVENTFLOW_MYSQL_DB                ?? 'eventflow',
+      debug                 : process.env.EVENTFLOW_MYSQL_DEBUG               ?? false,
+      insecureAuth          : process.env.EVENTFLOW_MYSQL_INSECURE_AUTH       ?? false,
+      enableKeepAlive       : process.env.EVENTFLOW_MYSQL_ENABLE_KEEP_ALIVE   ?? true,
+      waitForConnections    : process.env.EVENTFLOW_MYSQL_WAIT_FOR_CONN       ?? true,
+      namedPlaceholders     : process.env.EVENTFLOW_MYSQL_NAMED_PLACEHOLDERS  ?? false,
+      idleTimeout           : process.env.EVENTFLOW_MYSQL_IDLE_TIMEOUT        ?? 0,
+      keepAliveInitialDelay : process.env.EVENTFLOW_MYSQL_KEEP_ALIVE_DELAY    ?? 0,
+      queueLimit            : process.env.EVENTFLOW_MYSQL_QUEUE_LIMIT         ?? 0,
+      connectionLimit       : process.env.EVENTFLOW_MYSQL_CONNECTION_LIMIT    ?? 10,
+      flags                 : process.env.EVENTFLOW_MYSQL_FLAGS               ?? '',
+      charset               : process.env.EVENTFLOW_MYSQL_CHARSET             ?? 'utf8mb4',
+      timezone              : process.env.EVENTFLOW_MYSQL_TIMEZONE            ?? 'Z',
+      host                  : process.env.EVENTFLOW_MYSQL_HOST                ?? 'localhost',
+      port                  : process.env.EVENTFLOW_MYSQL_PORT                ?? '3306',
+      user                  : process.env.EVENTFLOW_MYSQL_USER                ?? 'root',
+      password              : process.env.EVENTFLOW_MYSQL_PASS                ?? 'root',
+      database              : process.env.EVENTFLOW_MYSQL_DB                  ?? 'eventflow',
     }
   }
 }

package/index.js

@@ -23,6 +23,8 @@ export function locate(locator)
  */
 export default class DB
 {
+  escape = mysql2.escape
+
   constructor(gateway)
   {
     this.gateway = gateway
@@ -295,7 +297,8 @@ export default class DB
 
     try
     {
-      result = await this.gateway.query('event/read-by-pid-domain-names', [ pid, domain, names ])
+      const castings = names.map(() => `CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin`).join(',')
+      result = await this.gateway.query('event/read-by-pid-domain-names', [ castings, pid, domain, ...names ])
     }
     catch(reason)
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/eventflow-db",
-  "version": "4.2.6",
+  "version": "4.3.0",
   "description": "Eventflow db is a set of common database logic in the eventflow ecosystem.",
   "keywords": [
     "eventflow"

package/sql/certificate/persist.sql

@@ -1,2 +1 @@
-INSERT INTO certificate
-SET ?
+INSERT INTO certificate SET ?

package/sql/certificate/read.sql

@@ -1,5 +1,5 @@
 SELECT *
 FROM certificate
-WHERE id = ?
+WHERE id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND version = 0
   AND revoked IS NULL

package/sql/certificate/revoke-past-validity.sql

@@ -6,7 +6,10 @@ LEFT JOIN
   GROUP BY id
 ) sub
 ON c.id = sub.id
-SET c.revoked = UTC_TIMESTAMP(),
-    c.version = sub.new_version
+
+SET
+  c.revoked = UTC_TIMESTAMP(),
+  c.version = sub.new_version
+
 WHERE c.version = 0
   AND c.validity < UTC_TIMESTAMP()

package/sql/certificate/revoke.sql

@@ -1,13 +1,19 @@
 UPDATE certificate AS c
 LEFT JOIN
 (
-  SELECT id, COUNT(*) AS new_version
+  SELECT 
+    id, 
+    COUNT(*) AS new_version
+
   FROM certificate
-  WHERE id = ?
+  WHERE id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
 ) sub
 ON c.id = sub.id
-SET c.revoked = UTC_TIMESTAMP(),
-    c.version = sub.new_version
-WHERE c.id = ?
+
+SET 
+  c.revoked = UTC_TIMESTAMP(),
+  c.version = sub.new_version
+
+WHERE c.id      = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND c.version = 0
   AND c.revoked IS NULL

package/sql/certificate/schema.sql

@@ -3,8 +3,8 @@ CREATE TABLE IF NOT EXISTS certificate
   created   DATETIME(3)   NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
   updated   DATETIME(3)   NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
   version   INT UNSIGNED  NOT NULL DEFAULT 0,
-  id        VARCHAR(64)   NOT NULL,
-  cert      TEXT          NOT NULL,
+  id        VARCHAR(64)   NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
+  cert      TEXT          NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
   `key`     BLOB          NOT NULL,
   key_iv    VARBINARY(16) NOT NULL,
   key_salt  VARBINARY(16) NOT NULL,

package/sql/event/delete-by-id.sql

@@ -1,3 +1,3 @@
 DELETE 
 FROM event
-WHERE id = ?
+WHERE id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event/delete-by-pid-domain.sql

@@ -1,4 +1,4 @@
 DELETE 
 FROM event
-WHERE pid     = ?
-  AND domain  = ?
+WHERE pid     = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND domain  = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event/persist.sql

@@ -1,3 +1 @@
-INSERT
-INTO event
-SET ?
+INSERT INTO event SET ?

package/sql/event/read-by-id.sql

@@ -1,3 +1,3 @@
 SELECT *
 FROM event
-WHERE id = ?
+WHERE id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event/read-by-pid-domain-betweeen-timestamps.sql

@@ -1,6 +1,6 @@
 SELECT *
 FROM event
-WHERE pid    = ?
-  AND domain = ?
+WHERE pid    = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND timestamp BETWEEN ? AND ?
 ORDER BY timestamp ASC

package/sql/event/read-by-pid-domain-names.sql

@@ -1,6 +1,6 @@
 SELECT *
 FROM event
-WHERE pid    = ?
-  AND domain = ?
-  AND name  IN (?)
+WHERE pid    = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND name IN (?%s)
 ORDER BY timestamp ASC

package/sql/event/read-by-pid-domain.sql

@@ -1,5 +1,5 @@
 SELECT *
 FROM event
-WHERE pid    = ?
-  AND domain = ?
+WHERE pid    = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
 ORDER BY timestamp ASC

package/sql/event/schema.sql

@@ -1,11 +1,11 @@
 CREATE TABLE IF NOT EXISTS event
 (
-  id        VARCHAR(64) NOT NULL,
+  id        VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
   timestamp DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
-  domain    VARCHAR(64) NOT NULL,
-  rid       VARCHAR(64)     NULL,
-  pid       VARCHAR(64) NOT NULL,
-  name      VARCHAR(64) NOT NULL,
+  domain    VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
+  rid       VARCHAR(64)     NULL CHARACTER SET ascii COLLATE ascii_bin,
+  pid       VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
+  name      VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
   data      JSON        NOT NULL,
 
   PRIMARY KEY (id),

package/sql/event_cpid/delete.sql

@@ -1,4 +1,4 @@
 DELETE 
 FROM event_cpid
-WHERE event_id = ?
-  AND cpid = ?
+WHERE event_id  = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND cpid      = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_cpid/persist.sql

@@ -1,3 +1,4 @@
-INSERT
-INTO event_cpid
-SET event_id = ?, cpid = ?
+INSERT INTO event_cpid
+SET
+  event_id = ?,
+  cpid     = ?

package/sql/event_cpid/read-by-cpid-domain.sql

@@ -1,7 +1,7 @@
 SELECT event.*
 FROM event_cpid
 JOIN event 
-  ON event_id = id AND event.domain = event_cpid.domain
-WHERE event_cpid.cpid   = ?
-  AND event_cpid.domain = ?
+  ON event_id = event.id AND event.domain = event_cpid.domain
+WHERE event_cpid.cpid   = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND event_cpid.domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
 ORDER BY timestamp ASC

package/sql/event_cpid/read-by-event_id.sql

@@ -1,3 +1,6 @@
-SELECT domain, cpid
+SELECT 
+  domain, 
+  cpid
+
 FROM event_cpid
-WHERE event_id = ?
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_cpid/schema.sql

@@ -1,8 +1,8 @@
 CREATE TABLE IF NOT EXISTS event_cpid 
 (
-  event_id  VARCHAR(64) NOT NULL,
-  domain    VARCHAR(64) NOT NULL,
-  cpid      VARCHAR(64) NOT NULL,
+  event_id  VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
+  domain    VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
+  cpid      VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
 
   PRIMARY KEY (event_id, domain, cpid),
   FOREIGN KEY (event_id) REFERENCES event (id)

package/sql/event_eid/delete.sql

@@ -1,4 +1,4 @@
 DELETE 
 FROM event_eid
-WHERE event_id = ?
-  AND eid = ?
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND eid      = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_eid/persist.sql

@@ -1,3 +1,4 @@
-INSERT
-INTO event_eid
-SET event_id = ?, eid = ?
+INSERT INTO event_eid
+SET 
+  event_id = ?,
+  eid      = ?

package/sql/event_eid/read-by-eid-domain.sql

@@ -1,7 +1,9 @@
 SELECT event.*
 FROM event_eid
 JOIN event 
-  ON event_id = id
-WHERE eid = ?
-  AND domain = ?
+  ON event_id = event.id
+
+WHERE eid    = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND domain = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+
 ORDER BY timestamp ASC

package/sql/event_eid/read-by-eid.sql

@@ -1,6 +1,7 @@
 SELECT event.*
 FROM event_eid
 JOIN event 
-  ON event_id = id
-WHERE eid = ?
+  ON event_id = event.id
+
+WHERE eid = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
 ORDER BY timestamp ASC

package/sql/event_eid/read-by-event_id.sql

@@ -1,3 +1,3 @@
 SELECT eid
 FROM event_eid
-WHERE event_id = ?
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_eid/schema.sql

@@ -1,7 +1,7 @@
 CREATE TABLE IF NOT EXISTS event_eid 
 (
-  event_id  VARCHAR(64) NOT NULL,
-  eid       VARCHAR(64) NOT NULL,
+  event_id  VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
+  eid       VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
 
   PRIMARY KEY (event_id, eid),
   FOREIGN KEY (event_id) REFERENCES event (id)

package/sql/event_published/persist.sql

@@ -1,3 +1 @@
-INSERT
-INTO event_published
-SET ?
+INSERT INTO event_published SET ?

package/sql/event_published/schema.sql

@@ -1,10 +1,10 @@
 CREATE TABLE IF NOT EXISTS event_published 
 (
-  event_id        VARCHAR(64) NOT NULL,
+  event_id        VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
   published       DATETIME    NOT NULL DEFAULT CURRENT_TIMESTAMP(),
-  publisher       VARCHAR(64) NOT NULL,
-  consumer        VARCHAR(64)     NULL,
-  hub             VARCHAR(64)     NULL,
+  publisher       VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
+  consumer        VARCHAR(64)     NULL CHARACTER SET ascii COLLATE ascii_bin,
+  hub             VARCHAR(64)     NULL CHARACTER SET ascii COLLATE ascii_bin,
   consumed_hub    DATETIME        NULL,
   consumed_spoke  DATETIME        NULL,
   success         DATETIME        NULL,

package/sql/event_published/update-to-consumed-by-hub.sql

@@ -1,5 +1,8 @@
 UPDATE event_published
-SET consumed_hub = UTC_TIMESTAMP(),
-    hub          = ?
-WHERE event_id   = ?
+
+SET 
+  consumed_hub = UTC_TIMESTAMP(),
+  hub          = ?
+
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND consumed_hub IS NULL

package/sql/event_published/update-to-consumed-by-spoke.sql

@@ -1,5 +1,8 @@
 UPDATE event_published
-SET consumed_spoke  = UTC_TIMESTAMP(),
-    consumer        = ?
-WHERE event_id      = ?
-  AND consumed_spoke  IS NULL
+
+SET
+  consumed_spoke = UTC_TIMESTAMP(),
+  consumer       = ?
+
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
+  AND consumed_spoke IS NULL

package/sql/event_published/update-to-failed.sql

@@ -1,3 +1,3 @@
 UPDATE event_published
-SET failed     = UTC_TIMESTAMP()
-WHERE event_id = ?
+SET failed = UTC_TIMESTAMP()
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_published/update-to-orphan.sql

@@ -1,3 +1,3 @@
 UPDATE event_published
-SET orphan     = UTC_TIMESTAMP()
-WHERE event_id = ?
+SET orphan = UTC_TIMESTAMP()
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_published/update-to-success.sql

@@ -1,3 +1,3 @@
 UPDATE event_published
-SET success    = UTC_TIMESTAMP()
-WHERE event_id = ?
+SET success = UTC_TIMESTAMP()
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_scheduled/persist.sql

@@ -1,3 +1 @@
-INSERT
-INTO event_scheduled
-SET ?
+INSERT INTO event_scheduled SET ?

package/sql/event_scheduled/schema.sql

@@ -1,6 +1,6 @@
 CREATE TABLE IF NOT EXISTS event_scheduled 
 (
-  event_id    VARCHAR(64) NOT NULL,
+  event_id    VARCHAR(64) NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
   timestamp   DATETIME    NOT NULL DEFAULT CURRENT_TIMESTAMP(),
   scheduled   DATETIME    NOT NULL,
   executed    DATETIME        NULL,

package/sql/event_scheduled/update-executed.sql

@@ -1,3 +1,3 @@
 UPDATE event_scheduled
-SET executed   = UTC_TIMESTAMP()
-WHERE event_id = ?
+SET executed = UTC_TIMESTAMP()
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_scheduled/update-failed.sql

@@ -1,3 +1,3 @@
 UPDATE event_scheduled
-SET failed     = UTC_TIMESTAMP()
-WHERE event_id = ?
+SET failed = UTC_TIMESTAMP()
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/event_scheduled/update-success.sql

@@ -1,3 +1,3 @@
 UPDATE event_scheduled
-SET success    = UTC_TIMESTAMP()
-WHERE event_id = ?
+SET success = UTC_TIMESTAMP()
+WHERE event_id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin

package/sql/hub/persist.sql

@@ -1,3 +1 @@
-INSERT
-INTO hub
-SET ?
+INSERT INTO hub SET ?

package/sql/hub/read-quit-hub.sql

@@ -1,4 +1,4 @@
 SELECT *
 FROM hub
-WHERE id = ?
+WHERE id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND quit IS NOT NULL

package/sql/hub/schema.sql

@@ -1,10 +1,10 @@
 CREATE TABLE IF NOT EXISTS hub 
 (
-  id            VARCHAR(64)       NOT NULL,
+  id            VARCHAR(64)       NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
   timestamp     DATETIME          NOT NULL DEFAULT CURRENT_TIMESTAMP(),
-  external_ip   VARCHAR(16)       NOT NULL,
+  external_ip   VARCHAR(16)       NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
   external_port SMALLINT UNSIGNED NOT NULL,
-  internal_ip   VARCHAR(16)       NOT NULL,
+  internal_ip   VARCHAR(16)       NOT NULL CHARACTER SET ascii COLLATE ascii_bin,
   internal_port SMALLINT UNSIGNED NOT NULL,
   quit          DATETIME              NULL,
 

package/sql/hub/update-to-quit.sql

@@ -1,4 +1,4 @@
 UPDATE hub
 SET quit = UTC_TIMESTAMP()
-WHERE id = ?
+WHERE id = CAST(? AS CHAR CHARACTER SET ascii) COLLATE ascii_bin
   AND quit IS NULL

package/sql/log/persist.sql

@@ -1,3 +1 @@
-INSERT
-INTO log
-SET ?
+INSERT INTO log SET ?

package/sql/log/schema.sql

@@ -1,8 +1,8 @@
 CREATE TABLE IF NOT EXISTS log 
 (
   timestamp DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
-  agent     VARCHAR(64) NOT NULL,
-  message   TEXT        NOT NULL,
+  agent     VARCHAR(64) NOT NULL CHARACTER SET ascii    COLLATE ascii_bin,
+  message   TEXT        NOT NULL CHARACTER SET utf8mb4  COLLATE utf8mb4_general_ci,
   error     JSON        NOT NULL,
   INDEX idx_timestamp (timestamp),
   INDEX idx_agent (agent)