@creator.co/wapi 1.7.11 → 1.7.12

package/dist/package.json

@@ -1,20 +1,20 @@
 {
     "name": "@creator.co/wapi",
-    "version": "1.7.11",
+    "version": "1.7.12",
     "description": "",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "type": "module",
     "scripts": {
-        "build": "tsc --build",
-        "clean": "tsc --build --clean",
-        "lint-fix": "eslint . --fix",
-        "lint": "eslint .",
-        "docs": "npx typedoc --tsconfig tsconfig.json index.ts src/**/* --includeVersion --entryPointStrategy expand",
-        "test": "npm run test-ts && npm run test-js",
-        "test-ts": "jest --coverage --silent --runInBand --logHeapUsage && cat coverage/coverage.txt",
-        "test-js": "rm -rf ./smoke-tests; tsc -p tsconfig.smoke.json && cd smoke-tests && npm i && NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest --config=./jest.smoke.config.js --coverage --silent --runInBand --logHeapUsage && cat coverage/coverage.txt",
-        "test-dev": "jest --coverage --runInBand && cat coverage/coverage.txt"
+        "build": "task build",
+        "clean": "task clean",
+        "lint-fix": "task lint-fix",
+        "lint": "task lint",
+        "docs": "task docs",
+        "test": "task test",
+        "test-ts": "task test-ts",
+        "test-js": "task test-js",
+        "test-dev": "task test-dev"
     },
     "author": "",
     "license": "ISC",
@@ -53,6 +53,7 @@
         "zod": "^3.23.4"
     },
     "devDependencies": {
+        "@go-task/cli": "^3.39.0",
         "@jest/globals": "^29.7.0",
         "@types/aws-lambda": "^8.10.145",
         "@types/chai": "^4.3.19",

package/dist/src/Cache/Redis.js

@@ -34,8 +34,10 @@ class Redis {
      */
     static redisClientConnection(config) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _b;
             console.debug('Starting remote client cache connection');
             const connection = _a.ClientFactory(Object.assign(Object.assign({ username: config.username }, (config.password ? { password: config.password } : {})), { disableOfflineQueue: true, socket: {
+                    port: Number((_b = config.port) !== null && _b !== void 0 ? _b : 6379),
                     host: config.hostname,
                     tls: config.enableTLS,
                     connectTimeout: 10000,
@@ -46,6 +48,7 @@ class Redis {
     }
     static redisClusterConnection(config) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _b;
             console.debug('Starting remote cluster cache connection');
             const connection = _a.ClusterFactory({
                 defaults: Object.assign(Object.assign({ username: config.username }, (config.password ? { password: config.password } : {})), { socket: {
@@ -54,7 +57,7 @@ class Redis {
                     } }),
                 rootNodes: [
                     {
-                        url: `redis://${config.username}:${config.username}@${config.hostname}:6379`,
+                        url: `redis://${config.username}:${config.username}@${config.hostname}:${Number((_b = config.port) !== null && _b !== void 0 ? _b : 6379)}`,
                         disableOfflineQueue: true,
                     },
                 ],

package/dist/src/Cache/Redis.js.map

@@ -1 +1 @@
-{"version":3,"file":"Redis.js","sourceRoot":"","sources":["../../../src/Cache/Redis.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAqC,aAAa,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAGtF,OAAO,cAAc,MAAM,2BAA2B,CAAA;AACtD;;GAEG;AACH,MAAqB,KAAK;IAkBjB,MAAM,CAAC,UAAU,CACtB,MAA4B;QAE5B,OAAO,EAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;IAEO,MAAM,CAAO,iBAAiB,CACpC,MAA4B;;YAE5B,IAAI,MAAM,CAAC,WAAW;gBAAE,OAAO,EAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;;gBAC9D,OAAO,EAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QACjD,CAAC;KAAA;IAED;;;;;;OAMG;IACK,MAAM,CAAO,qBAAqB,CACxC,MAA4B;;YAE5B,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;YACxD,MAAM,UAAU,GAAG,EAAK,CAAC,aAAa,+BACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IACtB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACzD,mBAAmB,EAAE,IAAI,EACzB,MAAM,EAAE;oBACN,IAAI,EAAE,MAAM,CAAC,QAAQ;oBACrB,GAAG,EAAE,MAAM,CAAC,SAAS;oBACrB,cAAc,EAAE,KAAK;iBACtB,IACD,CAAA;YACF,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,UAAiB,CAAA;QAC1B,CAAC;KAAA;IAEO,MAAM,CAAO,sBAAsB,CACzC,MAA4B;;YAE5B,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;YACzD,MAAM,UAAU,GAAG,EAAK,CAAC,cAAc,CAAC;gBACtC,QAAQ,gCACN,QAAQ,EAAE,MAAM,CAAC,QAAQ,IACtB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACzD,MAAM,EAAE;wBACN,GAAG,EAAE,MAAM,CAAC,SAAS;wBACrB,cAAc,EAAE,KAAK;qBACtB,GACF;gBACD,SAAS,EAAE;oBACT;wBACE,GAAG,EAAE,WAAW,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,OAAO;wBAC5E,mBAAmB,EAAE,IAAI;qBAC1B;iBACF;aACF,CAAC,CAAA;YACF,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,UAAiB,CAAA;QAC1B,CAAC;KAAA;;;AA/Ec,eAAS,GAAG,IAAI,cAAc,CAG3C,EAAK,CAAC,iBAAiB,EAAE,CAAM,CAAC,EAAC,EAAE,kDAAC,OAAA,CAAC,CAAC,MAAM,CAAA,GAAA,CAAC,AAHvB,CAGuB;AAE/C;;;GAGG;AACY,mBAAa,GAAG,YAAY,AAAf,CAAe;AAE3C;;;GAGG;AACY,oBAAc,GAAG,aAAa,AAAhB,CAAgB;eAhB1B,KAAK"}
+{"version":3,"file":"Redis.js","sourceRoot":"","sources":["../../../src/Cache/Redis.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAqC,aAAa,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAGtF,OAAO,cAAc,MAAM,2BAA2B,CAAA;AACtD;;GAEG;AACH,MAAqB,KAAK;IAkBjB,MAAM,CAAC,UAAU,CACtB,MAA4B;QAE5B,OAAO,EAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACzC,CAAC;IAEO,MAAM,CAAO,iBAAiB,CACpC,MAA4B;;YAE5B,IAAI,MAAM,CAAC,WAAW;gBAAE,OAAO,EAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;;gBAC9D,OAAO,EAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QACjD,CAAC;KAAA;IAED;;;;;;OAMG;IACK,MAAM,CAAO,qBAAqB,CACxC,MAA4B;;;YAE5B,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;YACxD,MAAM,UAAU,GAAG,EAAK,CAAC,aAAa,+BACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IACtB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACzD,mBAAmB,EAAE,IAAI,EACzB,MAAM,EAAE;oBACN,IAAI,EAAE,MAAM,CAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,IAAI,CAAC;oBACjC,IAAI,EAAE,MAAM,CAAC,QAAQ;oBACrB,GAAG,EAAE,MAAM,CAAC,SAAS;oBACrB,cAAc,EAAE,KAAK;iBACtB,IACD,CAAA;YACF,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,UAAiB,CAAA;QAC1B,CAAC;KAAA;IAEO,MAAM,CAAO,sBAAsB,CACzC,MAA4B;;;YAE5B,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;YACzD,MAAM,UAAU,GAAG,EAAK,CAAC,cAAc,CAAC;gBACtC,QAAQ,gCACN,QAAQ,EAAE,MAAM,CAAC,QAAQ,IACtB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACzD,MAAM,EAAE;wBACN,GAAG,EAAE,MAAM,CAAC,SAAS;wBACrB,cAAc,EAAE,KAAK;qBACtB,GACF;gBACD,SAAS,EAAE;oBACT;wBACE,GAAG,EAAE,WAAW,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,IAAI,CAAC,EAAE;wBACtG,mBAAmB,EAAE,IAAI;qBAC1B;iBACF;aACF,CAAC,CAAA;YACF,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,UAAiB,CAAA;QAC1B,CAAC;KAAA;;;AAhFc,eAAS,GAAG,IAAI,cAAc,CAG3C,EAAK,CAAC,iBAAiB,EAAE,CAAM,CAAC,EAAC,EAAE,kDAAC,OAAA,CAAC,CAAC,MAAM,CAAA,GAAA,CAAC,AAHvB,CAGuB;AAE/C;;;GAGG;AACY,mBAAa,GAAG,YAAY,AAAf,CAAe;AAE3C;;;GAGG;AACY,oBAAc,GAAG,aAAa,AAAhB,CAAgB;eAhB1B,KAAK"}

package/dist/src/Cache/types.d.ts

@@ -16,6 +16,7 @@ export type CacheClass = {
 export type CacheBaseConfig = {
     hostname: string;
     username: string;
+    port?: string | number;
     password?: string;
     enableTLS: boolean;
     clusterMode?: boolean;

package/dist/src/Database/integrations/kysely/KyselyTransaction.d.ts

@@ -4,7 +4,7 @@ import { Database } from '../../Database.js';
 import { DatabaseTransaction } from '../../DatabaseTransaction.js';
 /**
  * Represents a transaction for querying a database with a specific schema.
- * @typeparam DBSchema - The schema of the database.
+ * @param DBSchema - The schema of the database.
  * @type {KyselyTransactionImpl<DBSchema> & Transaction<DBSchema>}
  */
 export type KyselyTransaction<DBSchema> = KyselyTransactionImpl<DBSchema> & Transaction<DBSchema>;

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../index.ts","../src/Globals.ts","../src/API/Request.ts","../src/API/Response.ts","../src/BaseEvent/DynamoTransaction.ts","../src/BaseEvent/EventProcessor.ts","../src/BaseEvent/Process.ts","../src/BaseEvent/Transaction.ts","../src/Cache/Redis.ts","../src/Cache/types.ts","../src/Config/Configuration.ts","../src/Config/EnvironmentVar.ts","../src/Crypto/Crypto.ts","../src/Crypto/JWT.ts","../src/Database/Database.ts","../src/Database/DatabaseManager.ts","../src/Database/DatabaseTransaction.ts","../src/Database/index.ts","../src/Database/types.ts","../src/Database/integrations/dynamo/DynamoDatabase.ts","../src/Database/integrations/knex/KnexDatabase.ts","../src/Database/integrations/knex/KnexTransaction.ts","../src/Database/integrations/kysely/KyselyDatabase.ts","../src/Database/integrations/kysely/KyselyTransaction.ts","../src/Database/integrations/pgsql/PostgresDatabase.ts","../src/Database/integrations/pgsql/PostgresTransaction.ts","../src/Logger/Logger.ts","../src/Mailer/Mailer.ts","../src/Publisher/Publisher.ts","../src/Server/RouteResolver.ts","../src/Server/Router.ts","../src/Server/lib/ContainerServer.ts","../src/Server/lib/Server.ts","../src/Server/lib/container/GenericHandler.ts","../src/Server/lib/container/GenericHandlerEvent.ts","../src/Server/lib/container/HealthHandler.ts","../src/Server/lib/container/Proxy.ts","../src/Server/lib/container/Utils.ts","../src/Util/AsyncSingleton.ts","../src/Util/Utils.ts","../src/Validation/Validator.ts","../package-lock.json","../package.json"],"version":"5.6.2"}

package/index.ts

@@ -15,30 +15,32 @@ import AsyncSingleton from './src/Util/AsyncSingleton.js'
 import Utils from './src/Util/Utils.js'
 
 /**
- * This module exports various classes and utilities for handling transactions, processes,
- * event processing, DynamoDB transactions, routing, mailing, cryptography, JWT handling,
- * configuration management, Redis operations, response handling, utility functions,
- * asynchronous singleton pattern, route definitions, transaction configurations,
- * response error types, HTTP methods, and database operations.
- * @exports {
- *   Transaction,
- *   Process,
- *   EventProcessor,
- *   DynamoTransaction,
- *   Router,
- *   Mailer,
- *   Crypto,
- *   JWT,
- *   Configuration,
- *   Redis,
- *   Response,
- *   Utils,
- *   AsyncSingleton,
- *   Route,
- *   TransactionConfig,
- *   ResponseErrorType,
- *   HttpMethod,
+ * This module exports various classes and utilities for handling transactions, processes, events,
+ * DynamoDB transactions, routing, mailing, cryptography, JWT, configuration, Redis, responses,
+ * utilities, asynchronous singletons, routes, transaction configurations, response error types,
+ * HTTP methods, and database operations.
  *
+ * Classes:
+ * - Transaction
+ * - Process
+ * - EventProcessor
+ * - DynamoTransaction
+ * - Router
+ * - Mailer
+ * - Crypto
+ * - JWT
+ * - Configuration
+ * - Redis
+ * - Response
+ * - Utils
+ * - AsyncSingleton
+ * - Route
+ * - TransactionConfig
+ * - Database
+ *
+ * Enums:
+ * - ResponseErrorType
+ * -
  */
 export {
   // Base Events

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@creator.co/wapi",
-  "version": "1.7.11",
+  "version": "1.7.12",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "scripts": {
-    "build": "tsc --build",
-    "clean": "tsc --build --clean",
-    "lint-fix": "eslint . --fix",
-    "lint": "eslint .",
-    "docs": "npx typedoc --tsconfig tsconfig.json index.ts src/**/* --includeVersion --entryPointStrategy expand",
-    "test": "npm run test-ts && npm run test-js",
-    "test-ts": "jest --coverage --silent --runInBand --logHeapUsage && cat coverage/coverage.txt",
-    "test-js": "rm -rf ./smoke-tests; tsc -p tsconfig.smoke.json && cd smoke-tests && npm i && NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest --config=./jest.smoke.config.js --coverage --silent --runInBand --logHeapUsage && cat coverage/coverage.txt",
-    "test-dev": "jest --coverage --runInBand && cat coverage/coverage.txt"
+    "build": "task build",
+    "clean": "task clean",
+    "lint-fix": "task lint-fix",
+    "lint": "task lint",
+    "docs": "task docs",
+    "test": "task test",
+    "test-ts": "task test-ts",
+    "test-js": "task test-js",
+    "test-dev": "task test-dev"
   },
   "author": "",
   "license": "ISC",
@@ -53,6 +53,7 @@
     "zod": "^3.23.4"
   },
   "devDependencies": {
+    "@go-task/cli": "^3.39.0",
     "@jest/globals": "^29.7.0",
     "@types/aws-lambda": "^8.10.145",
     "@types/chai": "^4.3.19",

package/src/Cache/Redis.ts

@@ -52,6 +52,7 @@ export default class Redis {
       ...(config.password ? { password: config.password } : {}),
       disableOfflineQueue: true,
       socket: {
+        port: Number(config.port ?? 6379),
         host: config.hostname,
         tls: config.enableTLS,
         connectTimeout: 10000,
@@ -77,7 +78,7 @@ export default class Redis {
       },
       rootNodes: [
         {
-          url: `redis://${config.username}:${config.username}@${config.hostname}:6379`,
+          url: `redis://${config.username}:${config.username}@${config.hostname}:${Number(config.port ?? 6379)}`,
           disableOfflineQueue: true,
         },
       ],

package/src/Cache/types.ts

@@ -19,6 +19,7 @@ export type CacheClass = {
 export type CacheBaseConfig = {
   hostname: string
   username: string
+  port?: string | number
   password?: string
   enableTLS: boolean
   clusterMode?: boolean

package/src/Database/integrations/kysely/KyselyTransaction.ts

@@ -6,7 +6,7 @@ import { DatabaseTransaction } from '../../DatabaseTransaction.js'
 
 /**
  * Represents a transaction for querying a database with a specific schema.
- * @typeparam DBSchema - The schema of the database.
+ * @param DBSchema - The schema of the database.
  * @type {KyselyTransactionImpl<DBSchema> & Transaction<DBSchema>}
  */
 export type KyselyTransaction<DBSchema> = KyselyTransactionImpl<DBSchema> & Transaction<DBSchema>

package/taskfile.yml

@@ -0,0 +1,65 @@
+version: '3'
+
+vars:
+  test_node_options: '--experimental-vm-modules'
+  coverage_file: 'coverage/coverage.txt'
+
+tasks:
+  build:
+    desc: Build the project
+    cmds:
+      - tsc --build
+
+  clean:
+    desc: Clean the build artifacts
+    cmds:
+      - tsc --build --clean
+
+  lint:
+    desc: Run ESLint
+    cmds:
+      - eslint .
+
+  lint-fix:
+    desc: Run ESLint and fix issues
+    cmds:
+      - eslint . --fix
+
+  docs:
+    desc: Generate documentation
+    cmds:
+      - npx typedoc --tsconfig tsconfig.json index.ts src/**/* --includeVersion --entryPointStrategy expand
+
+  test:
+    desc: Run all tests
+    cmds:
+      - task test-ts
+      - task test-js
+
+  test-ts:
+    desc: Run TypeScript tests
+    cmds:
+      - jest --workerIdleMemoryLimit=1024 --coverage --silent --runInBand --logHeapUsage
+      - cat {{.coverage_file}}
+
+  test-js:
+    desc: Run JavaScript smoke tests
+    cmds:
+      - rm -rf ./smoke-tests
+      - tsc -p tsconfig.smoke.json
+      - task test-js-inner
+
+  test-js-inner:
+    desc: Run smoke tests in the smoke-tests directory
+    dir: smoke-tests
+    cmds:
+      - cp -R ../node_modules node_modules
+      - npm i
+      - NODE_OPTIONS="$NODE_OPTIONS {{.test_node_options}}" jest --workerIdleMemoryLimit=1024 --config=./jest.smoke.config.js --coverage --silent --runInBand --logHeapUsage
+      - cat ../{{.coverage_file}}
+
+  test-dev:
+    desc: Run tests in development mode
+    cmds:
+      - jest --coverage --runInBand
+      - cat {{.coverage_file}}

package/tests/Cache/Redis-client.test.ts

@@ -34,6 +34,7 @@ async function simpleRedisTest(config: any, concurrent?: boolean) {
     ...(config.password ? { password: config.password } : {}),
     disableOfflineQueue: true,
     socket: {
+      port: 6379,
       host: config.hostname,
       tls: config.enableTLS,
       connectTimeout: 10000,