extra-pool 0.1.0 → 0.1.2

package/README.md

@@ -31,9 +31,10 @@ await dbConnectionPool.destroy()
 interface IPoolOptions<T> {
   create: () => Awaitable<T>
   destroy?: (instance: T) => Awaitable<void>
-  maxInstances: number
+  maxInstances?: number
   minInstances?: number = 0
   idleTimeout?: number = 0
+  concurrencyPerInstance? = 1
 }
 
 class Pool<T> {

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB"}

package/lib/{es2015/instance.d.ts → instance.d.ts}

@@ -8,10 +8,12 @@ export declare enum InstanceState {
     Destroyed = "destroyed"
 }
 export declare class Instance<T> {
-    private destroyValue?;
+    private destroyInstance?;
     private fsm;
-    readonly _value: Deferred<T>;
-    constructor(createValue: () => Awaitable<T>, destroyValue?: ((value: T) => Awaitable<void>) | undefined);
+    private _users;
+    readonly _instance: Deferred<T>;
+    get users(): number;
+    constructor(createInstance: () => Awaitable<T>, destroyInstance?: ((value: T) => Awaitable<void>) | undefined);
     waitForCreated(): Promise<void>;
     getState(): InstanceState;
     use<U>(fn: (instance: T) => Awaitable<U>): Promise<U>;

package/lib/{es2018/instance.js → instance.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Instance = exports.InstanceState = void 0;
 const prelude_1 = require("@blackglory/prelude");
 const extra_promise_1 = require("extra-promise");
-const structures_1 = require("@blackglory/structures");
+const extra_fsm_1 = require("extra-fsm");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 var InstanceState;
@@ -23,7 +23,7 @@ const instanceSchema = {
         destroy: InstanceState.Destroying
     },
     [InstanceState.Using]: {
-        used: InstanceState.Idle
+        idle: InstanceState.Idle
     },
     [InstanceState.Destroying]: {
         destroyed: InstanceState.Destroyed
@@ -31,49 +31,65 @@ const instanceSchema = {
     [InstanceState.Destroyed]: {}
 };
 class Instance {
-    constructor(createValue, destroyValue) {
-        this.destroyValue = destroyValue;
-        this._value = new extra_promise_1.Deferred();
-        this.fsm = new structures_1.ObservableFiniteStateMachine(instanceSchema, InstanceState.Creating);
+    get users() {
+        return this._users;
+    }
+    constructor(createInstance, destroyInstance) {
+        this.destroyInstance = destroyInstance;
+        this._users = 0;
+        this._instance = new extra_promise_1.Deferred();
+        this.fsm = new extra_fsm_1.ObservableFiniteStateMachine(instanceSchema, InstanceState.Creating);
         (0, prelude_1.go)(async () => {
             try {
-                const val = await createValue();
-                this._value.resolve(val);
+                const instance = await createInstance();
                 this.fsm.send('created');
+                this._instance.resolve(instance);
             }
             catch (e) {
-                this._value.reject(e);
+                this._instance.reject(e);
             }
         });
     }
     async waitForCreated() {
-        await this._value;
+        await this._instance;
     }
     getState() {
         return this.fsm.state;
     }
     async use(fn) {
-        this.fsm.send('use');
-        const value = await this._value;
+        (0, prelude_1.assert)(this.fsm.state !== InstanceState.Destroying &&
+            this.fsm.state !== InstanceState.Destroyed, 'The instance is not available');
+        this._users++;
+        if (this.fsm.state === InstanceState.Creating) {
+            await this._instance;
+        }
+        if (this.fsm.state === InstanceState.Idle) {
+            this.fsm.send('use');
+        }
+        (0, prelude_1.assert)(this.fsm.state === InstanceState.Using, 'The instance state should be using');
+        const instance = await this._instance;
         try {
-            return await fn(value);
+            const result = await fn(instance);
+            return result;
         }
         finally {
-            this.fsm.send('used');
+            if ((--this._users) === 0) {
+                this.fsm.send('idle');
+            }
         }
     }
     async destroy() {
         var _a;
-        if (this.fsm.matches(InstanceState.Creating) ||
-            this.fsm.matches(InstanceState.Using)) {
+        if (this.fsm.state === InstanceState.Creating ||
+            this.fsm.state === InstanceState.Using) {
             await (0, rxjs_1.firstValueFrom)(this.fsm.observeStateChanges().pipe((0, operators_1.filter)(state => state.newState === InstanceState.Idle)));
         }
-        if (this.fsm.matches(InstanceState.Idle)) {
+        if (this.fsm.state === InstanceState.Idle) {
             this.fsm.send('destroy');
-            await ((_a = this.destroyValue) === null || _a === void 0 ? void 0 : _a.call(this, await this._value));
+            await ((_a = this.destroyInstance) === null || _a === void 0 ? void 0 : _a.call(this, await this._instance));
             this.fsm.send('destroyed');
         }
-        else if (this.fsm.matches(InstanceState.Destroying)) {
+        else if (this.fsm.state === InstanceState.Destroying) {
             await (0, rxjs_1.firstValueFrom)(this.fsm.observeStateChanges().pipe((0, operators_1.filter)(state => state.newState === InstanceState.Destroyed)));
         }
     }

package/lib/instance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instance.js","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"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"}

package/lib/{es2015/pool.d.ts → pool.d.ts}

@@ -6,16 +6,18 @@ interface IPoolOptions<T> {
     maxInstances?: number;
     minInstances?: number;
     idleTimeout?: number;
+    concurrencyPerInstance?: number;
 }
 export declare class Pool<T> {
-    private createValue;
-    private destroyValue?;
+    private createInstance;
+    private destroyInstance?;
     private fsm;
+    private waitingUsers;
     private items;
-    private userDeferredQueue;
     private maxInstances;
     private minInstances;
     private idleTimeout;
+    private concurrencyPerInstance;
     get size(): number;
     constructor(options: IPoolOptions<T>);
     use<U>(fn: (instance: T) => Awaitable<U>): Promise<U>;

package/lib/{es2018/pool.js → pool.js}

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnavailablePool = exports.Pool = void 0;
 const errors_1 = require("@blackglory/errors");
+const prelude_1 = require("@blackglory/prelude");
 const structures_1 = require("@blackglory/structures");
+const extra_fsm_1 = require("extra-fsm");
 const extra_promise_1 = require("extra-promise");
 const iterable_operator_1 = require("iterable-operator");
-const instance_1 = require("./instance");
 const extra_timers_1 = require("extra-timers");
+const instance_1 = require("./instance");
 var PoolState;
 (function (PoolState) {
     PoolState["Running"] = "running";
@@ -23,70 +25,79 @@ const poolSchema = {
     [PoolState.Destroyed]: {}
 };
 class Pool {
+    get size() {
+        return this.items.size;
+    }
     constructor(options) {
-        var _a, _b, _c;
-        this.fsm = new structures_1.FiniteStateMachine(poolSchema, PoolState.Running);
+        var _a, _b, _c, _d;
+        this.fsm = new extra_fsm_1.FiniteStateMachine(poolSchema, PoolState.Running);
+        this.waitingUsers = new structures_1.Queue();
         this.items = new Set();
-        this.userDeferredQueue = new structures_1.Queue();
-        this.createValue = options.create;
-        this.destroyValue = options.destroy;
+        this.createInstance = options.create;
+        this.destroyInstance = options.destroy;
         this.maxInstances = (_a = options.maxInstances) !== null && _a !== void 0 ? _a : Infinity;
         this.minInstances = (_b = options.minInstances) !== null && _b !== void 0 ? _b : 0;
         this.idleTimeout = (_c = options.idleTimeout) !== null && _c !== void 0 ? _c : 0;
-    }
-    get size() {
-        return this.items.size;
+        this.concurrencyPerInstance = (_d = options.concurrencyPerInstance) !== null && _d !== void 0 ? _d : 1;
     }
     async use(fn) {
         const self = this;
-        const item = (0, iterable_operator_1.find)(this.items, instance => !instance.using);
+        const item = (0, prelude_1.go)(() => {
+            const candidateItems = (0, iterable_operator_1.toArray)((0, iterable_operator_1.filter)(this.items, item => item.instance.users < this.concurrencyPerInstance));
+            if (candidateItems.length) {
+                return candidateItems.reduce((previous, current) => {
+                    if (current.instance.users < previous.instance.users) {
+                        return current;
+                    }
+                    else {
+                        return previous;
+                    }
+                });
+            }
+        });
         if (item) {
-            return await use(item);
+            return await useItem(item);
         }
         else {
             if (this.items.size < this.maxInstances) {
-                const instance = new instance_1.Instance(this.createValue, this.destroyValue);
-                const item = {
-                    instance,
-                    using: true
-                };
+                const instance = new instance_1.Instance(this.createInstance, this.destroyInstance);
+                const item = { instance };
                 this.items.add(item);
-                return await use(item);
+                return await useItem(item);
             }
             else {
-                const deferred = new extra_promise_1.Deferred();
-                this.userDeferredQueue.enqueue(deferred);
-                const item = await deferred;
-                return await use(item);
+                const waitingUser = new extra_promise_1.Deferred();
+                this.waitingUsers.enqueue(waitingUser);
+                const item = await waitingUser;
+                return await useItem(item);
             }
         }
-        async function use(item) {
-            item.using = true;
-            if (item.cancelDeletion) {
-                item.cancelDeletion();
-                delete item.cancelDeletion;
+        async function useItem(item) {
+            if (item.cancelScheduledDeletion) {
+                item.cancelScheduledDeletion();
+                delete item.cancelScheduledDeletion;
             }
-            await item.instance.waitForCreated();
             try {
                 return await item.instance.use(fn);
             }
             finally {
-                if (self.userDeferredQueue.size > 0) {
-                    self.userDeferredQueue.dequeue().resolve(item);
+                const waitingUser = self.waitingUsers.dequeue();
+                if (waitingUser) {
+                    waitingUser.resolve(item);
                 }
                 else {
-                    item.using = false;
-                    if (self.items.size > self.minInstances) {
+                    if (item.instance.users === 0 &&
+                        self.items.size > self.minInstances) {
                         if (self.idleTimeout > 0) {
-                            item.cancelDeletion = (0, extra_timers_1.setTimeout)(self.idleTimeout, removeItem);
+                            item.cancelScheduledDeletion = (0, extra_timers_1.setTimeout)(self.idleTimeout, deleteInstance);
                         }
                         else {
-                            await removeItem();
+                            await deleteInstance();
                         }
                     }
                 }
             }
-            async function removeItem() {
+            async function deleteInstance() {
                 self.items.delete(item);
                 await item.instance.destroy();
             }
@@ -99,7 +110,7 @@ class Pool {
         }
         this.items.clear();
         let deferred;
-        while (deferred = this.userDeferredQueue.dequeue()) {
+        while (deferred = this.waitingUsers.dequeue()) {
             deferred.reject(new UnavailablePool());
         }
         this.fsm.send('destroyed');

package/lib/pool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-pool",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A library that helps you create object/thread/connection pools",
   "keywords": [
     "pool",
@@ -10,10 +10,10 @@
   ],
   "files": [
     "lib",
-    "dist"
+    "src"
   ],
-  "main": "lib/es2018/index.js",
-  "types": "lib/es2018/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "sideEffects": false,
   "repository": "git@github.com:BlackGlory/extra-pool.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
@@ -24,18 +24,11 @@
     "test": "jest --runInBand --config jest.config.js",
     "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
     "test:coverage": "jest --coverage --config jest.config.js",
-    "prepublishOnly": "run-s clean build bundle",
-    "clean": "run-p clean:*",
-    "clean:build": "rimraf lib",
-    "clean:bundle": "rimraf dist",
-    "build": "run-p build:*",
-    "build:es2015": "run-s build:es2015:*",
-    "build:es2015:compile": "tsc --project tsconfig.build.json --module commonjs --target es2015 --outDir lib/es2015",
-    "build:es2015:patch": "tscpaths -p tsconfig.build.json -s ./src -o ./lib/es2015",
-    "build:es2018": "run-s build:es2018:*",
-    "build:es2018:compile": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib/es2018",
-    "build:es2018:patch": "tscpaths -p tsconfig.build.json -s ./src -o ./lib/es2018",
-    "bundle": "rollup --config rollup.config.js",
+    "prepublishOnly": "run-s clean build",
+    "clean": "rimraf lib",
+    "build": "run-s build:*",
+    "build:compile": "tsc --project tsconfig.build.json --module commonjs --target es2018 --outDir lib",
+    "build:patch": "tscpaths -p tsconfig.build.json -s ./src -o ./lib",
     "release": "standard-version"
   },
   "husky": {
@@ -45,39 +38,31 @@
     }
   },
   "devDependencies": {
-    "@blackglory/jest-matchers": "^0.3.1",
-    "@commitlint/cli": "^17.0.3",
-    "@commitlint/config-conventional": "^17.0.3",
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.4.0",
-    "@types/jest": "^27.4.1",
-    "@typescript-eslint/eslint-plugin": "^5.35.1",
-    "@typescript-eslint/parser": "^5.35.1",
-    "eslint": "^8.22.0",
+    "@commitlint/cli": "^17.3.0",
+    "@commitlint/config-conventional": "^17.3.0",
+    "@types/jest": "^29.2.3",
+    "@typescript-eslint/eslint-plugin": "^5.44.0",
+    "@typescript-eslint/parser": "^5.44.0",
+    "eslint": "^8.28.0",
     "husky": "^4.3.8",
-    "jest": "^27.5.1",
+    "jest": "^29.3.1",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "rollup": "^2.78.1",
-    "rollup-plugin-analyzer": "^4.0.0",
-    "rollup-plugin-terser": "^7.0.2",
     "standard-version": "^9.5.0",
-    "ts-jest": "^27.1.4",
+    "ts-jest": "^29.0.3",
     "tscpaths": "^0.0.9",
-    "tslib": "^2.3.1",
-    "typescript": "^4.8.2",
+    "tslib": "^2.4.1",
+    "typescript": "^4.9.3",
     "yarn-deduplicate": "^6.0.0"
   },
   "dependencies": {
-    "@blackglory/errors": "^2.2.2",
-    "@blackglory/prelude": "^0.1.4",
-    "@blackglory/structures": "^0.10.14",
-    "extra-promise": "^3.2.0",
+    "@blackglory/errors": "^2.3.0",
+    "@blackglory/prelude": "^0.1.8",
+    "@blackglory/structures": "^0.11.4",
+    "extra-fsm": "^0.1.1",
+    "extra-promise": "^4.4.0",
     "extra-timers": "^0.2.5",
-    "iterable-operator": "^1.2.1",
-    "rxjs": "^7.5.6"
+    "iterable-operator": "^2.5.0",
+    "rxjs": "^7.5.7"
   }
 }

package/src/index.ts

@@ -0,0 +1 @@
+export * from './pool'

package/src/instance.ts

@@ -0,0 +1,133 @@
+import { go, assert, Awaitable } from '@blackglory/prelude'
+import { Deferred } from 'extra-promise'
+import { ObservableFiniteStateMachine } from 'extra-fsm'
+import { firstValueFrom } from 'rxjs'
+import { filter } from 'rxjs/operators'
+
+export enum InstanceState {
+  Creating = 'creating'
+, Idle = 'idle'
+, Using = 'using'
+, Destroying = 'destroying'
+, Destroyed = 'destroyed'
+}
+
+type InstanceEvent =
+| 'created'
+| 'use'
+| 'idle'
+| 'destroy'
+| 'destroyed'
+
+const instanceSchema = {
+  [InstanceState.Creating]: {
+    created: InstanceState.Idle
+  }
+, [InstanceState.Idle]: {
+    use: InstanceState.Using
+  , destroy: InstanceState.Destroying
+  }
+, [InstanceState.Using]: {
+    idle: InstanceState.Idle
+  }
+, [InstanceState.Destroying]: {
+    destroyed: InstanceState.Destroyed
+  }
+, [InstanceState.Destroyed]: {}
+}
+
+export class Instance<T> {
+  private fsm: ObservableFiniteStateMachine<InstanceState, InstanceEvent>
+  private _users = 0
+  readonly _instance: Deferred<T>
+
+  get users(): number {
+    return this._users
+  }
+
+  constructor(
+    createInstance: () => Awaitable<T>
+  , private destroyInstance?: (value: T) => Awaitable<void>
+  ) {
+    this._instance = new Deferred<T>()
+    this.fsm = new ObservableFiniteStateMachine<InstanceState, InstanceEvent>(
+      instanceSchema
+    , InstanceState.Creating
+    )
+
+    go(async () => {
+      try {
+        const instance = await createInstance()
+        this.fsm.send('created')
+        this._instance.resolve(instance)
+      } catch (e) {
+        this._instance.reject(e)
+      }
+    })
+  }
+
+  async waitForCreated(): Promise<void> {
+    await this._instance
+  }
+
+  getState(): InstanceState {
+    return this.fsm.state
+  }
+
+  async use<U>(fn: (instance: T) => Awaitable<U>): Promise<U> {
+    // 不要尝试将此处的代码改编成switch管道, 很难正确编写.
+
+    assert(
+      this.fsm.state !== InstanceState.Destroying &&
+      this.fsm.state !== InstanceState.Destroyed
+    , 'The instance is not available'
+    )
+
+    this._users++
+
+    if (this.fsm.state === InstanceState.Creating) {
+      await this._instance
+    }
+
+    if (this.fsm.state === InstanceState.Idle) {
+      this.fsm.send('use')
+    }
+
+    assert(this.fsm.state === InstanceState.Using, 'The instance state should be using')
+    const instance = await this._instance
+    try {
+      const result = await fn(instance)
+      return result
+    } finally {
+      if ((--this._users) === 0) {
+        this.fsm.send('idle')
+      }
+    }
+  }
+
+  async destroy(): Promise<void> {
+    if (
+      this.fsm.state === InstanceState.Creating ||
+      this.fsm.state === InstanceState.Using
+    ) {
+      await firstValueFrom(
+        this.fsm.observeStateChanges().pipe(
+          filter(state => state.newState === InstanceState.Idle)
+        )
+      )
+    }
+
+    if (this.fsm.state === InstanceState.Idle) {
+      this.fsm.send('destroy')
+      // 如果destroyed过程报错, 则程序崩溃, 这是预期行为.
+      await this.destroyInstance?.(await this._instance)
+      this.fsm.send('destroyed')
+    } else if (this.fsm.state === InstanceState.Destroying) {
+      await firstValueFrom(
+        this.fsm.observeStateChanges().pipe(
+          filter(state => state.newState === InstanceState.Destroyed)
+        )
+      )
+    }
+  }
+}