@creator.co/wapi 1.7.5-alpha1 → 1.7.5-alpha2

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { HttpMethod } from './src/API/Request.js';
 import Response, { ResponseErrorType } from './src/API/Response.js';
 import EventProcessor from './src/BaseEvent/EventProcessor.js';
 import Process from './src/BaseEvent/Process.js';
-import Transaction from './src/BaseEvent/Transaction.js';
+import Transaction, { TransactionConfig } from './src/BaseEvent/Transaction.js';
 import Redis from './src/Cache/Redis.js';
 import Configuration from './src/Config/Configuration.js';
 import Crypto from './src/Crypto/Crypto.js';
@@ -34,4 +34,4 @@ import Utils from './src/Util/Utils.js';
  *   Database,
  * }
  */
-export { Transaction, Process, EventProcessor, Router, Mailer, Crypto, JWT, Configuration, Redis, Response, Utils, AsyncSingleton, Route, ResponseErrorType, HttpMethod, Database, };
+export { Transaction, Process, EventProcessor, Router, Mailer, Crypto, JWT, Configuration, Redis, Response, Utils, AsyncSingleton, Route, TransactionConfig, ResponseErrorType, HttpMethod, Database, };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,QAA+B,MAAM,uBAAuB,CAAA;AACnE,OAAO,cAAc,MAAM,mCAAmC,CAAA;AAC9D,OAAO,OAAO,MAAM,4BAA4B,CAAA;AAChD,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,aAAa,MAAM,+BAA+B,CAAA;AACzD,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAC3C,OAAO,GAAG,MAAM,qBAAqB,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAC3C,OAAO,MAAiB,MAAM,wBAAwB,CAAA;AACtD,OAAO,cAAc,MAAM,8BAA8B,CAAA;AACzD,OAAO,KAAK,MAAM,qBAAqB,CAAA;AAEvC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO;AACL,cAAc;AACd,WAAW,EACX,OAAO,EACP,cAAc,EACd,MAAM;AACN,iCAAiC;AACjC,MAAM,EACN,MAAM,EACN,GAAG,EACH,aAAa,EACb,KAAK;AACL,MAAM;AACN,QAAQ;AACR,UAAU;AACV,KAAK,EACL,cAAc,EAId,UAAU,EACV,QAAQ,GACT,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,QAA+B,MAAM,uBAAuB,CAAA;AACnE,OAAO,cAAc,MAAM,mCAAmC,CAAA;AAC9D,OAAO,OAAO,MAAM,4BAA4B,CAAA;AAChD,OAAO,WAAkC,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,aAAa,MAAM,+BAA+B,CAAA;AACzD,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAC3C,OAAO,GAAG,MAAM,qBAAqB,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAC3C,OAAO,MAAiB,MAAM,wBAAwB,CAAA;AACtD,OAAO,cAAc,MAAM,8BAA8B,CAAA;AACzD,OAAO,KAAK,MAAM,qBAAqB,CAAA;AAEvC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO;AACL,cAAc;AACd,WAAW,EACX,OAAO,EACP,cAAc,EACd,MAAM;AACN,iCAAiC;AACjC,MAAM,EACN,MAAM,EACN,GAAG,EACH,aAAa,EACb,KAAK;AACL,MAAM;AACN,QAAQ;AACR,UAAU;AACV,KAAK,EACL,cAAc,EAKd,UAAU,EACV,QAAQ,GACT,CAAA"}

package/dist/src/Database/index.d.ts

@@ -2,7 +2,6 @@ import { Database } from './Database.js';
 import { DatabaseManager } from './DatabaseManager.js';
 import { DatabaseTransaction } from './DatabaseTransaction.js';
 import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js';
-import { DynamoTransaction } from './integrations/dynamo/DynamoTransaction.js';
 import { KnexDatabase } from './integrations/knex/KnexDatabase.js';
 import { KnexTransaction } from './integrations/knex/KnexTransaction.js';
 import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js';
@@ -10,4 +9,4 @@ import { KyselyTransaction } from './integrations/kysely/KyselyTransaction.js';
 import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js';
 import { PostgresTransaction } from './integrations/pgsql/PostgresTransaction.js';
 import { DbConfig } from './types.js';
-export { DatabaseTransaction, Database, DatabaseManager, DbConfig, KnexTransaction, KnexDatabase, PostgresTransaction, PostgresDatabase, KyselyTransaction, KyselyDatabase, DynamoTransaction, DynamoDatabase, };
+export { DatabaseTransaction, Database, DatabaseManager, DbConfig, KnexTransaction, KnexDatabase, PostgresTransaction, PostgresDatabase, KyselyTransaction, KyselyDatabase, DynamoDatabase, };

package/dist/src/Database/index.js

@@ -2,7 +2,7 @@ import { Database } from './Database.js';
 import { DatabaseManager } from './DatabaseManager.js';
 import { DatabaseTransaction } from './DatabaseTransaction.js';
 import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js';
-import { DynamoTransaction } from './integrations/dynamo/DynamoTransaction.js';
+// import { DynamoTransaction } from './integrations/dynamo/DynamoTransaction.js'
 import { KnexDatabase } from './integrations/knex/KnexDatabase.js';
 import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js';
 import { PostgresDatabase } from './integrations/pgsql/PostgresDatabase.js';
@@ -12,5 +12,6 @@ DatabaseTransaction, Database,
 // 'Entrypoints'
 DatabaseManager, KnexDatabase, PostgresDatabase, KyselyDatabase, 
 // Dynamo
-DynamoTransaction, DynamoDatabase, };
+// DynamoTransaction,
+DynamoDatabase, };
 //# sourceMappingURL=index.js.map

package/dist/src/Database/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Database/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAA;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAA;AAI3E,OAAO;AACL,YAAY;AACZ,mBAAmB,EACnB,QAAQ;AACR,gBAAgB;AAChB,eAAe,EAIf,YAAY,EAGZ,gBAAgB,EAGhB,cAAc;AACd,SAAS;AACT,iBAAiB,EACjB,cAAc,GACf,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Database/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AACxE,iFAAiF;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAA;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAA;AAI3E,OAAO;AACL,YAAY;AACZ,mBAAmB,EACnB,QAAQ;AACR,gBAAgB;AAChB,eAAe,EAIf,YAAY,EAGZ,gBAAgB,EAGhB,cAAc;AACd,SAAS;AACT,qBAAqB;AACrB,cAAc,GACf,CAAA"}

package/dist/src/Database/integrations/dynamo/DynamoDatabase.d.ts

@@ -1,11 +1,10 @@
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
-import { DynamoTransaction } from './DynamoTransaction.js';
 import { Database } from '../../Database.js';
 import type { DbConfig } from '../../types.js';
-export declare class DynamoDatabase extends Database<DynamoTransaction> {
+export declare class DynamoDatabase extends Database<any> {
     private static dynamoProvider;
     readonly client: DynamoDBClient;
     constructor(config: DbConfig<'dynamo'>);
-    transaction(): Promise<DynamoTransaction>;
+    transaction(): Promise<any>;
     private providerFactory;
 }

package/dist/src/Database/integrations/dynamo/DynamoDatabase.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { Agent } from 'https';
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { NodeHttpHandler } from '@smithy/node-http-handler';
-import { DynamoTransaction } from './DynamoTransaction.js';
 import { Database } from '../../Database.js';
 export class DynamoDatabase extends Database {
     constructor(config) {
@@ -19,7 +18,7 @@ export class DynamoDatabase extends Database {
     }
     transaction() {
         return __awaiter(this, void 0, void 0, function* () {
-            return DynamoTransaction.newTransaction(this.client, this);
+            return Promise.resolve(null);
         });
     }
     providerFactory(config) {

package/dist/src/Database/integrations/dynamo/DynamoDatabase.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamoDatabase.js","sourceRoot":"","sources":["../../../../../src/Database/integrations/dynamo/DynamoDatabase.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAG5C,MAAM,OAAO,cAAe,SAAQ,QAA2B;IAI7D,YAAmB,MAA0B;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAEqB,WAAW;;YAC/B,OAAO,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5D,CAAC;KAAA;IAEO,eAAe,CAAC,MAA0B;QAChD,OAAO,IAAI,cAAc,CAAC,cAAc,CAAC;YACvC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,cAAc,EAAE,IAAI,eAAe,CAAC;gBAClC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,aAAa,EAAE,MAAM,CAAC,iBAAiB;gBACvC,UAAU,EAAE,IAAI,KAAK,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;aACtF,CAAC;SACH,CAAC,CAAA;IACJ,CAAC;;AAtBc,6BAAc,GAAG,cAAc,CAAA"}
+{"version":3,"file":"DynamoDatabase.js","sourceRoot":"","sources":["../../../../../src/Database/integrations/dynamo/DynamoDatabase.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAG5C,MAAM,OAAO,cAAe,SAAQ,QAAa;IAI/C,YAAmB,MAA0B;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAEqB,WAAW;;YAC/B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC9B,CAAC;KAAA;IAEO,eAAe,CAAC,MAA0B;QAChD,OAAO,IAAI,cAAc,CAAC,cAAc,CAAC;YACvC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,cAAc,EAAE,IAAI,eAAe,CAAC;gBAClC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,aAAa,EAAE,MAAM,CAAC,iBAAiB;gBACvC,UAAU,EAAE,IAAI,KAAK,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;aACtF,CAAC;SACH,CAAC,CAAA;IACJ,CAAC;;AAtBc,6BAAc,GAAG,cAAc,CAAA"}

package/index.ts

@@ -2,7 +2,7 @@ import { HttpMethod } from './src/API/Request.js'
 import Response, { ResponseErrorType } from './src/API/Response.js'
 import EventProcessor from './src/BaseEvent/EventProcessor.js'
 import Process from './src/BaseEvent/Process.js'
-import Transaction from './src/BaseEvent/Transaction.js'
+import Transaction, { TransactionConfig } from './src/BaseEvent/Transaction.js'
 import Redis from './src/Cache/Redis.js'
 import Configuration from './src/Config/Configuration.js'
 import Crypto from './src/Crypto/Crypto.js'
@@ -53,6 +53,7 @@ export {
   Utils,
   AsyncSingleton,
   Route,
+  TransactionConfig,
   // Misc types
   ResponseErrorType,
   HttpMethod,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@creator.co/wapi",
-  "version": "1.7.5-alpha1",
+  "version": "1.7.5-alpha2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Database/index.ts

@@ -2,7 +2,7 @@ import { Database } from './Database.js'
 import { DatabaseManager } from './DatabaseManager.js'
 import { DatabaseTransaction } from './DatabaseTransaction.js'
 import { DynamoDatabase } from './integrations/dynamo/DynamoDatabase.js'
-import { DynamoTransaction } from './integrations/dynamo/DynamoTransaction.js'
+// import { DynamoTransaction } from './integrations/dynamo/DynamoTransaction.js'
 import { KnexDatabase } from './integrations/knex/KnexDatabase.js'
 import { KnexTransaction } from './integrations/knex/KnexTransaction.js'
 import { KyselyDatabase } from './integrations/kysely/KyselyDatabase.js'
@@ -28,6 +28,6 @@ export {
   KyselyTransaction,
   KyselyDatabase,
   // Dynamo
-  DynamoTransaction,
+  // DynamoTransaction,
   DynamoDatabase,
 }

package/src/Database/integrations/dynamo/DynamoDatabase.ts

@@ -3,11 +3,10 @@ import { Agent } from 'https'
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb'
 import { NodeHttpHandler } from '@smithy/node-http-handler'
 
-import { DynamoTransaction } from './DynamoTransaction.js'
 import { Database } from '../../Database.js'
 import type { DbConfig } from '../../types.js'
 
-export class DynamoDatabase extends Database<DynamoTransaction> {
+export class DynamoDatabase extends Database<any> {
   private static dynamoProvider = DynamoDBClient
   public readonly client: DynamoDBClient
 
@@ -16,17 +15,17 @@ export class DynamoDatabase extends Database<DynamoTransaction> {
     this.client = this.providerFactory(config)
   }
 
-  public override async transaction(): Promise<DynamoTransaction> {
-    return DynamoTransaction.newTransaction(this.client, this)
+  public override async transaction(): Promise<any> {
+    return Promise.resolve(null)
   }
 
   private providerFactory(config: DbConfig<'dynamo'>) {
     return new DynamoDatabase.dynamoProvider({
       region: config.region,
-      maxAttempts: config.maxAttempts,
+      maxAttempts: config.maxAttempts || 3,
       requestHandler: new NodeHttpHandler({
-        connectionTimeout: config.connectionTimeout,
-        socketTimeout: config.connectionTimeout,
+        connectionTimeout: config.connectionTimeout || 60,
+        socketTimeout: config.connectionTimeout || 60,
         httpsAgent: new Agent({ keepAlive: false, maxSockets: 50, rejectUnauthorized: true }),
       }),
     })

package/src/Server/RouteResolver.ts

@@ -110,10 +110,15 @@ export default class RouteResolver {
    * @returns None
    */
   private buildRoutes(config: RouterConfig): void {
-    for (const route of config.routes) {
-      const parts = route.path.split('/').filter(p => p.length)
+    const addRoute = (path: string, route: AnyRoute) => {
+      const parts = path.split('/').filter(p => p.length)
       this.routes[route.method] = this.routes[route.method] || new Routes()
       this.routes[route.method]!.addRoute(route, parts)
     }
+    for (const route of config.routes) {
+      if (Array.isArray(route.path)) {
+        for (const path of route.path) addRoute(path, route)
+      } else addRoute(route.path, route)
+    }
   }
 }

package/src/Server/Router.ts

@@ -36,7 +36,7 @@ export interface Route<
    * @param {string} path - The file path.
    * @returns None
    */
-  path: string
+  path: string | string[]
   /**
    * Represents the method used in an API request.
    * @type {string}

package/src/Database/integrations/dynamo/DynamoTransaction.ts

@@ -1,29 +0,0 @@
-import { DynamoDBClient } from '@aws-sdk/client-dynamodb'
-
-import { DynamoDatabase } from './DynamoDatabase.js'
-import { DatabaseTransaction } from '../../DatabaseTransaction.js'
-
-export class DynamoTransaction extends DatabaseTransaction {
-  public readonly writer: DynamoDBClient
-  protected database: DynamoDatabase
-  private constructor(writer: DynamoDBClient, database: DynamoDatabase) {
-    super(writer, database)
-  }
-
-  public static async newTransaction(
-    writer: DynamoDBClient,
-    database: DynamoDatabase
-  ): Promise<DynamoTransaction> {
-    const tx = new DynamoTransaction(writer, database)
-    await tx.begin() // defaults to opened
-    return DatabaseTransaction.proxyInstance(tx) as any
-  }
-
-  protected doBegin = async () => {}
-  protected doCommit = () => {
-    return Promise.resolve()
-  }
-  protected doRollback = () => {
-    return Promise.resolve()
-  }
-}