@rnaga/wp-node 1.3.3 → 1.3.5

package/common/config/define-wp.config..d.ts

@@ -1,7 +1,7 @@
 import type * as types from "../../types";
 export declare const defineWPConfig: (config: Required<{
     staticAssetsPath: types.Config["staticAssetsPath"];
-    database: types.Config["database"];
+    database: types.DatabaseConfig;
 }> & Partial<{
     postTypeObject: types.PostTypeObject;
     postStatusObject: types.PostStatusObject;

package/common/config/define-wp.config..d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"define-wp.config..d.ts","sourceRoot":"","sources":["../../../src/common/config/define-wp.config..ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAC;AAM1C,eAAO,MAAM,cAAc,GACzB,QAAQ,QAAQ,CAAC;IACf,gBAAgB,EAAE,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnD,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;CACpC,CAAC,GACA,OAAO,CAAC;IACN,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC;IACrC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,CAAC;IACzC,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC;CAClC,CAAC,GACF,OAAO,CAAC;IACN,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;CAC1B,CAAC,GACF,KAAK,CAAC,YAAY,KAEnB,KAAK,CAAC,MAsER,CAAC"}
+{"version":3,"file":"define-wp.config..d.ts","sourceRoot":"","sources":["../../../src/common/config/define-wp.config..ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,aAAa,CAAC;AAM1C,eAAO,MAAM,cAAc,GACzB,QAAQ,QAAQ,CAAC;IACf,gBAAgB,EAAE,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACnD,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC;CAChC,CAAC,GACA,OAAO,CAAC;IACN,cAAc,EAAE,KAAK,CAAC,cAAc,CAAC;IACrC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,CAAC;IACzC,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC;CAClC,CAAC,GACF,OAAO,CAAC;IACN,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;CAC1B,CAAC,GACF,KAAK,CAAC,YAAY,KAEnB,KAAK,CAAC,MAsER,CAAC"}

package/config.d.ts

@@ -55,6 +55,7 @@ export declare class Config {
                 user?: string | undefined;
                 password?: string | undefined;
                 database?: string | undefined;
+                ssl?: Record<string, any> | undefined;
             };
         };
         posts: {

package/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,KAAK,MAAM,SAAS,CAAC;AAGtC,qBACa,MAAM;;gBAGL,MAAM,EAAE,KAAK,CAAC,MAAM;IAIhC,WAAW;IAIX,KAAK;IAKL,kBAAkB;IAOlB,IAAI,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAET;IAED,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;CAG5C"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,KAAK,MAAM,SAAS,CAAC;AAGtC,qBACa,MAAM;;gBAGL,MAAM,EAAE,KAAK,CAAC,MAAM;IAIhC,WAAW;IAIX,KAAK;IAKL,kBAAkB;IAOlB,IAAI,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAET;IAED,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC;CAG5C"}

package/database.d.ts

@@ -2,17 +2,15 @@ import { Knex } from "knex";
 import { Config } from "./config";
 export type DbConnection = Knex | undefined;
 export default class Database {
-    #private;
     private config;
-    static connections: Knex[];
     static perSiteTables: (keyof import("./types").Tables)[];
+    private connectionKey;
     constructor(config: Config);
     get prefix(): string;
     hasTable(tableName: string): Promise<boolean>;
     get connection(): Knex<any, any[]>;
     get transaction(): Promise<Knex.Transaction<any, any[]>>;
     get schema(): Knex.SchemaBuilder;
-    closeConnection(): void;
     static closeAll(): void;
 }
 //# sourceMappingURL=database.d.ts.map

package/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC;AAG5C,MAAM,CAAC,OAAO,OAAO,QAAQ;;IAKf,OAAO,CAAC,MAAM;IAJ1B,MAAM,CAAC,WAAW,EAAE,IAAI,EAAE,CAAM;IAChC,MAAM,CAAC,aAAa,qCAAgC;gBAGhC,MAAM,EAAE,MAAM;IAmBlC,IAAI,MAAM,WAET;IAEK,QAAQ,CAAC,SAAS,EAAE,MAAM;IAIhC,IAAI,UAAU,qBAEb;IAED,IAAI,WAAW,0CAEd;IAED,IAAI,MAAM,uBAET;IAED,eAAe;IAUf,MAAM,CAAC,QAAQ;CAOhB"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../src/database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC;AAY5C,MAAM,CAAC,OAAO,OAAO,QAAQ;IAIf,OAAO,CAAC,MAAM;IAH1B,MAAM,CAAC,aAAa,qCAAgC;IACpD,OAAO,CAAC,aAAa,CAAS;gBAEV,MAAM,EAAE,MAAM;IAsBlC,IAAI,MAAM,WAET;IAEK,QAAQ,CAAC,SAAS,EAAE,MAAM;IAIhC,IAAI,UAAU,qBAEb;IAED,IAAI,WAAW,0CAEd;IAED,IAAI,MAAM,uBAET;IAED,MAAM,CAAC,QAAQ;CAMhB"}

package/database.js

@@ -11,36 +11,43 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var Database_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-const constants_1 = require("./constants");
+const crypto_1 = require("crypto");
+const moment_1 = __importDefault(require("moment"));
 const config_1 = require("./config");
+const constants_1 = require("./constants");
 const component_1 = require("./decorators/component");
-const constants_2 = require("./constants");
-const moment_1 = __importDefault(require("moment"));
+// Multiple Knex instances keyed by connection configuration
+const knexInstances = new Map();
+const generateConnectionKey = (config) => {
+    const connection = config.connection;
+    const connectionString = `${connection.host}:${connection.port}:${connection.database}:${connection.user}`;
+    return (0, crypto_1.createHash)("sha256").update(connectionString).digest("hex");
+};
 let Database = class Database {
-    static { Database_1 = this; }
     config;
-    static connections = [];
-    static perSiteTables = constants_2.DEFAULT_DATABASE_TABLES.blog;
-    #knex;
+    static perSiteTables = constants_1.DEFAULT_DATABASE_TABLES.blog;
+    connectionKey;
     constructor(config) {
         this.config = config;
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        this.#knex = require("knex")({
-            ...this.config.config.database,
-            connection: {
-                ...this.config.config.database.connection,
-                timezone: "+00:00", // UTC
-                typeCast: (field, next) => {
-                    if (field.type == "DATETIME") {
-                        return (0, moment_1.default)(field.string()).format("YYYY-MM-DD HH:mm:ss");
-                    }
-                    return next();
+        this.connectionKey = generateConnectionKey(this.config.config.database);
+        if (!knexInstances.has(this.connectionKey)) {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            const knex = require("knex")({
+                ...this.config.config.database,
+                connection: {
+                    ...this.config.config.database.connection,
+                    timezone: "+00:00", // UTC
+                    typeCast: (field, next) => {
+                        if (field.type == "DATETIME") {
+                            return (0, moment_1.default)(field.string()).format("YYYY-MM-DD HH:mm:ss");
+                        }
+                        return next();
+                    },
                 },
-            },
-        });
-        Database_1.connections.push(this.#knex);
+            });
+            knexInstances.set(this.connectionKey, knex);
+        }
     }
     get prefix() {
         return this.config.config.tablePrefix;
@@ -49,32 +56,23 @@ let Database = class Database {
         return await this.connection.schema.hasTable(tableName);
     }
     get connection() {
-        return this.#knex;
+        return knexInstances.get(this.connectionKey);
     }
     get transaction() {
-        return this.#knex.transaction();
+        return knexInstances.get(this.connectionKey).transaction();
     }
     get schema() {
-        return this.#knex.schema;
-    }
-    closeConnection() {
-        for (let i = 0; i < Database_1.connections.length; i++) {
-            if (Database_1.connections[i] === this.#knex) {
-                Database_1.connections.splice(i, 1);
-                break;
-            }
-        }
-        this.#knex.destroy();
+        return knexInstances.get(this.connectionKey).schema;
     }
     static closeAll() {
-        for (const conn of Database_1.connections) {
-            conn.destroy();
+        for (const knex of knexInstances.values()) {
+            knex.destroy();
         }
-        Database_1.connections = [];
+        knexInstances.clear();
     }
 };
-Database = Database_1 = __decorate([
-    (0, component_1.component)({ scope: constants_1.Scope.Singleton }),
+Database = __decorate([
+    (0, component_1.component)(),
     __metadata("design:paramtypes", [config_1.Config])
 ], Database);
 exports.default = Database;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnaga/wp-node",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && tsc --project tsconfig.build.json && npm run copyfiles && cp package.json ./dist/",

package/types/config.d.ts

@@ -23,7 +23,9 @@ export type ConfigPostStatusObject = Omit<
   "label" | "_builtin"
 >;
 
-export type JSONWPConfig = DeepPartial<Exclude<Config, "database">> &
+export type DatabaseConfig = Config["database"];
+
+export type JSONWPConfig = DeepPartial<Omit<Config, "database">> &
   Required<{
     staticAssetsPath: Config["staticAssetsPath"];
   }>;

package/validators/config.d.ts

@@ -57,6 +57,7 @@ export declare const config: z.ZodObject<{
             charset: z.ZodString;
             password: z.ZodOptional<z.ZodString>;
             database: z.ZodOptional<z.ZodString>;
+            ssl: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
         }, z.core.$strip>;
     }, z.core.$strip>;
     posts: z.ZodObject<{
@@ -206,6 +207,7 @@ export declare const configs: z.ZodRecord<z.ZodString, z.ZodObject<{
             charset: z.ZodString;
             password: z.ZodOptional<z.ZodString>;
             database: z.ZodOptional<z.ZodString>;
+            ssl: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
         }, z.core.$strip>;
     }, z.core.$strip>;
     posts: z.ZodObject<{

package/validators/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/validators/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwHjB,CAAC;AAEH,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAA+B,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/validators/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAyHjB,CAAC;AAEH,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAA+B,CAAC"}

package/validators/config.js

@@ -97,6 +97,7 @@ exports.config = zod_1.z.object({
                 .string()
                 .optional()
                 .refine((v) => v && v.length > 0),
+            ssl: zod_1.z.record(zod_1.z.string(), zod_1.z.any()).optional(),
         }),
     }),
     posts: zod_1.z.object({