@creator.co/wapi 1.5.3-alpha1 → 1.5.4

package/src/Server/lib/container/Proxy.ts

@@ -7,8 +7,8 @@ import Server from './../Server'
 import GenericHandler from './GenericHandler'
 import HealthHandler from './HealthHandler'
 import { version as appVersion } from '../../../../package.json'
-import Utils from '../../../API/Utils'
 import Globals from '../../../Globals'
+import Utils from '../../../Util/Utils'
 import { RouterConfig } from '../../Router'
 
 /**

package/src/Util/AsyncSingleton.ts

@@ -0,0 +1,86 @@
+type ResolveReject = [(value: void | PromiseLike<void>) => void, (reason?: any) => void]
+
+/**
+ * Represents a class that can be used to create a singleton instance of a class that is created asynchronously.
+ */
+export default class AsyncSingleton<T, R> {
+  private readonly factory: (r: R) => Promise<T>
+  private readonly checker: (value: T) => Promise<boolean>
+
+  private queue: ResolveReject[] = []
+  private instantiating: boolean = false
+
+  private value?: T
+
+  /**
+   * Creates a new instance of the AsyncSingleton class.
+   * @param factory The factory function that creates the instance.
+   * @param checker The function that checks if the instance is valid.
+   */
+  public constructor(
+    factory: (r: R) => Promise<T>,
+    checker: (value: T) => Promise<boolean> = async () => true
+  ) {
+    this.factory = factory
+    this.checker = checker
+  }
+
+  /**
+   * Gets the instance of the class.
+   * @param r The configuration object for creating the instance.
+   */
+  public async instance(r: R): Promise<T> {
+    if (this.value && (await this.checker(this.value))) return this.value
+
+    if (this.instantiating) {
+      return await this.awaitOtherInit()
+    }
+
+    return await this.initHere(r)
+  }
+
+  /**
+   * Gets the current value, may be undefined or invalid.
+   */
+  public getValue(): T | undefined {
+    return this.value
+  }
+
+  /**
+   * Clears the current value and rejects all pending promises.
+   */
+  public clear() {
+    this.value = undefined
+    for (const [, rej] of this.queue) {
+      rej()
+    }
+    this.queue = []
+  }
+
+  private async initHere(r: R): Promise<T> {
+    try {
+      this.instantiating = true
+      this.value = await this.factory(r)
+
+      for (const [res] of this.queue) {
+        res()
+      }
+
+      this.queue = []
+
+      return this.value
+    } finally {
+      for (const [, rej] of this.queue) {
+        rej()
+      }
+      this.instantiating = false
+    }
+  }
+
+  private async awaitOtherInit(): Promise<T> {
+    await new Promise<void>((res, rej) => {
+      this.queue.push([res, rej])
+    })
+    return this.value!
+  }
+}

package/tests/API/Utils.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 
-import Utils from '../../src/API/Utils'
+import Utils from '../../src/Util/Utils'
 
 describe('isHybridlessContainer', () => {
   test('Simple isHybridlessContainer test', () => {

package/tests/Cache/{Redis.test.ts → Redis-client.test.ts}

@@ -1,6 +1,7 @@
 import Redis from '../../src/Cache/Redis'
 
 let _connectionId = 1
+
 async function simpleRedisTest(config: any, concurrent?: boolean) {
   const RedisMock = jest.fn(() => {
     let opened = false
@@ -20,18 +21,11 @@ async function simpleRedisTest(config: any, concurrent?: boolean) {
     } as any
   })
   Redis['ClientFactory'] = RedisMock
-  // Cleanup previous connection
-  if (Redis['_connection']) (await Redis.connection({} as any))?.['close']()
   // Double call is intentional
-  let provider, provider2
-  if (concurrent) {
-    const ps = await Promise.all([Redis.connection(config as any), Redis.connection(config as any)])
-    provider = ps[0]
-    provider2 = ps[1]
-  } else {
-    provider = await Redis.connection(config as any)
-    provider2 = await Redis.connection(config as any)
-  }
+  const [provider, provider2] = concurrent
+    ? await Promise.all([Redis.connection(config), Redis.connection(config)])
+    : [await Redis.connection(config), await Redis.connection(config)]
+
   // client checks
   expect(RedisMock).toHaveBeenNthCalledWith(1, {
     username: config.username,
@@ -44,46 +38,26 @@ async function simpleRedisTest(config: any, concurrent?: boolean) {
     },
   })
   // Does not have double connection
-  expect(provider.connectionId).toEqual(provider2.connectionId)
+  expect(provider['connectionId']).toEqual(provider2['connectionId'])
   expect(provider.connect).toHaveBeenCalledTimes(1)
   expect(provider2.connect).toHaveBeenCalledTimes(1)
 }
 
-describe('Redis', () => {
+describe('Redis (client)', () => {
   beforeEach(async () => {
     // hack to close singleton connection
-    // if (Redis['_connection']) (await Redis.connection({} as any))?.['close']()
+    if (Redis['singleton'].getValue()) Redis['singleton'].clear()
   })
   test('Simple redis - do not connect twice', async () => {
-    try {
-      const c = await Redis.connection({
-        // fetch from SSM -> /shared/redis-primary-endpoint for dev/prod
-        // note: prefix needs to be set through code
-        hostname: 'localhost',
-        username: 'writer',
-        password: 'writer', // passwordless but redis clie needs this
-        enableTLS: true,
-        type: 'redis',
-      })
-      await c.set('abc', 123)
-      const a = await c.get('abc')
-      await c.flushAll()
-      console.log(a)
-      console.log('de')
-    } catch (e) {
-      console.error(e)
-    }
-    // Redis['_connection'] = null as any
-    // await simpleRedisTest({
-    //   hostname: 'redis://localhost',
-    //   username: 'gabe',
-    //   password: 'mypassword',
-    //   enableTLS: true,
-    //   type: 'redis',
-    // })
+    await simpleRedisTest({
+      hostname: 'redis://localhost',
+      username: 'gabe',
+      password: 'mypassword',
+      enableTLS: true,
+      type: 'redis',
+    })
   })
   test('Simple redis (no SSL) - do not connect twice', async () => {
-    Redis['_connection'] = null as any
     await simpleRedisTest({
       hostname: 'redis://localhost',
       username: 'gabe',
@@ -93,7 +67,6 @@ describe('Redis', () => {
     })
   })
   test('Simple redis (passwordless) - do not connect twice', async () => {
-    Redis['_connection'] = null as any
     await simpleRedisTest({
       hostname: 'redis://localhost',
       username: 'gabe',
@@ -102,7 +75,6 @@ describe('Redis', () => {
     })
   })
   test('Concurrent redis - do not connect twice', async () => {
-    Redis['_connection'] = null as any
     await simpleRedisTest(
       {
         hostname: 'redis://localhost',

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

@@ -0,0 +1,98 @@
+import Redis from '../../src/Cache/Redis'
+
+let _connectionId = 1
+
+async function simpleRedisTest(config: any, concurrent?: boolean) {
+  const RedisMock = jest.fn(() => {
+    let opened = false
+    const connectionId = _connectionId++
+    return {
+      connectionId,
+      isOpen: () => opened,
+      close: () => (opened = false),
+      connect: jest.fn(() => {
+        opened = true
+        return {
+          mget: jest.fn(() => {
+            return true
+          }),
+        }
+      }),
+    } as any
+  })
+  Redis['ClusterFactory'] = RedisMock
+  // Double call is intentional
+  const [provider, provider2] = concurrent
+    ? await Promise.all([Redis.connection(config), Redis.connection(config)])
+    : [await Redis.connection(config), await Redis.connection(config)]
+
+  // client checks
+  expect(RedisMock).toHaveBeenNthCalledWith(1, {
+    defaults: {
+      username: config.username,
+      ...(config.password ? { password: config.password } : {}),
+      socket: {
+        ...(config.enableTLS ? { tls: true } : {}),
+        connectTimeout: 10000,
+      },
+    },
+    rootNodes: [
+      {
+        url: `redis://${config.username}:${config.username}@${config.hostname}:6379`,
+        disableOfflineQueue: true,
+      },
+    ],
+  })
+  // Does not have double connection
+  expect(provider['connectionId']).toEqual(provider2['connectionId'])
+  expect(provider.connect).toHaveBeenCalledTimes(1)
+  expect(provider2.connect).toHaveBeenCalledTimes(1)
+}
+
+describe('Redis (cluster)', () => {
+  beforeEach(async () => {
+    // hack to close singleton connection
+    if (Redis['singleton'].getValue()) Redis['singleton'].clear()
+  })
+  test('Simple redis - do not connect twice', async () => {
+    await simpleRedisTest({
+      hostname: 'redis://localhost',
+      username: 'gabe',
+      password: 'mypassword',
+      enableTLS: true,
+      clusterMode: true,
+      type: 'redis',
+    })
+  })
+  test('Simple redis (no SSL) - do not connect twice', async () => {
+    await simpleRedisTest({
+      hostname: 'redis://localhost',
+      username: 'gabe',
+      password: 'mypassword',
+      enableTLS: false,
+      clusterMode: true,
+      type: 'redis',
+    })
+  })
+  test('Simple redis (passwordless) - do not connect twice', async () => {
+    await simpleRedisTest({
+      hostname: 'redis://localhost',
+      username: 'gabe',
+      enableTLS: false,
+      clusterMode: true,
+      type: 'redis',
+    })
+  })
+  test('Concurrent redis - do not connect twice', async () => {
+    await simpleRedisTest(
+      {
+        hostname: 'redis://localhost',
+        username: 'gabe',
+        enableTLS: false,
+        clusterMode: true,
+        type: 'redis',
+      },
+      true
+    )
+  })
+})

package/dist/src/API/Utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/API/Utils.ts"],"names":[],"mappings":";;AAAA;;GAEG;AACH;IAAA;IAwEA,CAAC;IAvEC;;;OAGG;IACW,2BAAqB,GAAnC;QACE,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,MAAM,CAAA;IACjD,CAAC;IAED;;;;OAIG;IACW,mBAAa,GAA3B,UAA4B,MAAc;QACxC,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACrD,CAAC;IAED;;;;OAIG;IACW,uBAAiB,GAA/B,UAAgC,GAAY;QAC1C,IAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,CAAA;QAC7B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,CAAC;IAED;;;;;OAKG;IACW,4BAAsB,GAApC,UAAqC,MAA0B;QAC7D,IAAI,CAAC,GAAG,IAAI,CAAA;QACZ,IAAI;YACF,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YACtC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC;gBAAE,CAAC,GAAG,IAAI,CAAA;SAC9C;QAAC,OAAO,CAAC,EAAE;YACV,WAAW;SACZ;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IAED;;;;OAIG;IACW,mBAAa,GAA3B,UAA4B,MAAc;QACxC,IAAI,SAAS,GAAG,GAAG,CAAA;QACnB,IAAI;YACF,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAA;SAClD;QACD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IAED;;;;;OAKG;IACW,iCAA2B,GAAzC,UAA0C,GAAQ,EAAE,GAAW;QAC7D,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,EAArC,CAAqC,CAAC,CAAA;QACxF,IAAI,cAAc,IAAI,cAAc,IAAI,EAAE;YAAE,OAAO,GAAG,CAAC,cAAc,CAAC,CAAA;QACtE,OAAO,IAAI,CAAA;IACb,CAAC;IACH,YAAC;AAAD,CAAC,AAxED,IAwEC"}