extra-pool 0.1.3 → 0.1.5

package/README.md

@@ -38,7 +38,8 @@ interface IPoolOptions<T> {
 }
 
 class Pool<T> {
-  get size(): number
+  readonly capacity: number
+  readonly size: number
 
   constructor(options: IPoolOptions<T>)
 

package/lib/index.d.ts

@@ -1 +1 @@
-export * from './pool';
+export * from './pool.js';

package/lib/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./pool"), exports);
+export * from './pool.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

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

package/lib/instance.d.ts

@@ -1,21 +1,23 @@
-import { Awaitable } from '@blackglory/prelude';
-import { Deferred } from 'extra-promise';
+import { Awaitable, NonEmptyArray } from '@blackglory/prelude';
 export declare enum InstanceState {
-    Creating = "creating",
-    Idle = "idle",
-    Using = "using",
-    Destroying = "destroying",
-    Destroyed = "destroyed"
+    Created = 0,
+    Initializing = 1,
+    Idle = 2,
+    Busy = 3,
+    Destroying = 4,
+    Destroyed = 5
 }
 export declare class Instance<T> {
+    #private;
+    private createInstance;
     private destroyInstance?;
     private fsm;
-    private _users;
-    readonly _instance: Deferred<T>;
+    private deferredCreateInstance;
+    private deferredDestroyInstance;
     get users(): number;
+    get state(): InstanceState;
     constructor(createInstance: () => Awaitable<T>, destroyInstance?: ((value: T) => Awaitable<void>) | undefined);
-    waitForCreated(): Promise<void>;
-    getState(): InstanceState;
     use<U>(fn: (instance: T) => Awaitable<U>): Promise<U>;
     destroy(): Promise<void>;
+    waitForState<States extends NonEmptyArray<InstanceState>>(...states: States): Promise<States[number]>;
 }

package/lib/instance.js

@@ -1,28 +1,43 @@
-"use strict";
-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 extra_fsm_1 = require("extra-fsm");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-var InstanceState;
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _Instance_users;
+import { pass } from '@blackglory/prelude';
+import { ObservableFiniteStateMachine } from 'extra-fsm';
+import { Deferred } from 'extra-promise';
+import { firstValueFrom } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+export var InstanceState;
 (function (InstanceState) {
-    InstanceState["Creating"] = "creating";
-    InstanceState["Idle"] = "idle";
-    InstanceState["Using"] = "using";
-    InstanceState["Destroying"] = "destroying";
-    InstanceState["Destroyed"] = "destroyed";
-})(InstanceState = exports.InstanceState || (exports.InstanceState = {}));
+    InstanceState[InstanceState["Created"] = 0] = "Created";
+    InstanceState[InstanceState["Initializing"] = 1] = "Initializing";
+    InstanceState[InstanceState["Idle"] = 2] = "Idle";
+    InstanceState[InstanceState["Busy"] = 3] = "Busy";
+    InstanceState[InstanceState["Destroying"] = 4] = "Destroying";
+    InstanceState[InstanceState["Destroyed"] = 5] = "Destroyed";
+})(InstanceState || (InstanceState = {}));
 const instanceSchema = {
-    [InstanceState.Creating]: {
-        created: InstanceState.Idle
+    [InstanceState.Created]: {
+        init: InstanceState.Initializing,
+        destroy: InstanceState.Destroyed
+    },
+    [InstanceState.Initializing]: {
+        inited: InstanceState.Idle,
+        fail: InstanceState.Created
     },
     [InstanceState.Idle]: {
-        use: InstanceState.Using,
+        use: InstanceState.Busy,
         destroy: InstanceState.Destroying
     },
-    [InstanceState.Using]: {
+    [InstanceState.Busy]: {
         idle: InstanceState.Idle
     },
     [InstanceState.Destroying]: {
@@ -30,69 +45,139 @@ const instanceSchema = {
     },
     [InstanceState.Destroyed]: {}
 };
-class Instance {
+export class Instance {
     get users() {
-        return this._users;
+        return __classPrivateFieldGet(this, _Instance_users, "f");
+    }
+    get state() {
+        return this.fsm.state;
     }
     constructor(createInstance, destroyInstance) {
+        this.createInstance = createInstance;
         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 instance = await createInstance();
-                this.fsm.send('created');
-                this._instance.resolve(instance);
-            }
-            catch (e) {
-                this._instance.reject(e);
-            }
-        });
-    }
-    async waitForCreated() {
-        await this._instance;
-    }
-    getState() {
-        return this.fsm.state;
+        this.fsm = new ObservableFiniteStateMachine(instanceSchema, InstanceState.Created);
+        this.deferredCreateInstance = createDeferred();
+        this.deferredDestroyInstance = createDeferred();
+        _Instance_users.set(this, 0);
     }
     async use(fn) {
-        (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');
+        const self = this;
+        switch (this.fsm.state) {
+            case InstanceState.Created: {
+                addUser();
+                try {
+                    this.fsm.send('init');
+                    let instance;
+                    try {
+                        instance = await this.createInstance();
+                        this.deferredCreateInstance.resolve(instance);
+                        this.fsm.send('inited');
+                    }
+                    catch (e) {
+                        this.deferredCreateInstance.reject(e);
+                        this.deferredCreateInstance = createDeferred();
+                        this.fsm.send('fail');
+                        throw e;
+                    }
+                    this.fsm.send('use');
+                    return await fn(instance);
+                }
+                finally {
+                    removeUser();
+                }
+            }
+            case InstanceState.Initializing: {
+                addUser();
+                try {
+                    const instance = await this.deferredCreateInstance;
+                    return await fn(instance);
+                }
+                finally {
+                    removeUser();
+                }
+            }
+            case InstanceState.Idle: {
+                addUser();
+                try {
+                    this.fsm.send('use');
+                    const instance = await this.deferredCreateInstance;
+                    return await fn(instance);
+                }
+                finally {
+                    removeUser();
+                }
+            }
+            case InstanceState.Busy: {
+                addUser();
+                try {
+                    const instance = await this.deferredCreateInstance;
+                    return await fn(instance);
+                }
+                finally {
+                    removeUser();
+                }
+            }
+            case InstanceState.Destroying:
+            case InstanceState.Destroyed: throw new Error('The instance is not available');
+            default: throw new Error(`Unhandled state`);
         }
-        (0, prelude_1.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;
+        function addUser() {
+            var _a, _b;
+            __classPrivateFieldSet(_a = self, _Instance_users, (_b = __classPrivateFieldGet(_a, _Instance_users, "f"), _b++, _b), "f");
         }
-        finally {
-            if ((--this._users) === 0) {
-                this.fsm.send('idle');
+        function removeUser() {
+            var _a, _b;
+            if ((__classPrivateFieldSet(_a = self, _Instance_users, (_b = __classPrivateFieldGet(_a, _Instance_users, "f"), --_b), "f")) === 0) {
+                if (self.fsm.can('idle'))
+                    self.fsm.send('idle');
             }
         }
     }
     async destroy() {
         var _a;
-        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.state === InstanceState.Idle) {
-            this.fsm.send('destroy');
-            await ((_a = this.destroyInstance) === null || _a === void 0 ? void 0 : _a.call(this, await this._instance));
-            this.fsm.send('destroyed');
-        }
-        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)));
+        switch (this.fsm.state) {
+            case InstanceState.Created: {
+                this.fsm.send('destroy');
+                return;
+            }
+            case InstanceState.Initializing: {
+                await this.waitForState(InstanceState.Idle, InstanceState.Created);
+                return await this.destroy();
+            }
+            case InstanceState.Idle: {
+                this.fsm.send('destroy');
+                const instance = await this.deferredCreateInstance;
+                try {
+                    await ((_a = this.destroyInstance) === null || _a === void 0 ? void 0 : _a.call(this, instance));
+                }
+                catch (e) {
+                    this.deferredDestroyInstance.reject(e);
+                    throw e;
+                }
+                this.fsm.send('destroyed');
+                this.deferredDestroyInstance.resolve();
+                return;
+            }
+            case InstanceState.Busy: {
+                await this.waitForState(InstanceState.Idle);
+                return await this.destroy();
+            }
+            case InstanceState.Destroying: {
+                await this.deferredDestroyInstance;
+                return;
+            }
+            case InstanceState.Destroyed: return;
+            default: throw new Error(`Unhandled state`);
         }
     }
+    async waitForState(...states) {
+        return await firstValueFrom(this.fsm.observeStateChanges().pipe(map(change => change.newState), filter(newState => states.includes(newState))));
+    }
+}
+_Instance_users = new WeakMap();
+function createDeferred() {
+    const deferred = new Deferred();
+    Promise.resolve(deferred).catch(pass);
+    return deferred;
 }
-exports.Instance = Instance;
 //# sourceMappingURL=instance.js.map

package/lib/instance.js.map

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

package/lib/pool.d.ts

@@ -1,5 +1,4 @@
-import { CustomError } from '@blackglory/errors';
-import { Awaitable } from '@blackglory/prelude';
+import { Awaitable, CustomError } from '@blackglory/prelude';
 interface IPoolOptions<T> {
     create: () => Awaitable<T>;
     destroy?: (value: T) => Awaitable<void>;
@@ -9,15 +8,16 @@ interface IPoolOptions<T> {
     concurrencyPerInstance?: number;
 }
 export declare class Pool<T> {
-    private createInstance;
-    private destroyInstance?;
-    private fsm;
-    private waitingUsers;
-    private items;
-    private maxInstances;
-    private minInstances;
-    private idleTimeout;
-    private concurrencyPerInstance;
+    private readonly createInstance;
+    private readonly destroyInstance?;
+    private readonly fsm;
+    private readonly waitingUsers;
+    private readonly items;
+    private readonly maxInstances;
+    private readonly minInstances;
+    private readonly idleTimeout;
+    private readonly concurrencyPerInstance;
+    get capacity(): number;
     get size(): number;
     constructor(options: IPoolOptions<T>);
     use<U>(fn: (instance: T) => Awaitable<U>): Promise<U>;

package/lib/pool.js

@@ -1,19 +1,15 @@
-"use strict";
-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 extra_timers_1 = require("extra-timers");
-const instance_1 = require("./instance");
+import { go, CustomError, isntEmptyArray, assert } from '@blackglory/prelude';
+import { Queue } from '@blackglory/structures';
+import { FiniteStateMachine } from 'extra-fsm';
+import { Deferred, each } from 'extra-promise';
+import { toArray, filter } from 'iterable-operator';
+import { setTimeout } from 'extra-timers';
+import { Instance } from './instance.js';
 var PoolState;
 (function (PoolState) {
-    PoolState["Running"] = "running";
-    PoolState["Destroying"] = "destroying";
-    PoolState["Destroyed"] = "destroyed";
+    PoolState[PoolState["Running"] = 0] = "Running";
+    PoolState[PoolState["Destroying"] = 1] = "Destroying";
+    PoolState[PoolState["Destroyed"] = 2] = "Destroyed";
 })(PoolState || (PoolState = {}));
 const poolSchema = {
     [PoolState.Running]: {
@@ -24,14 +20,17 @@ const poolSchema = {
     },
     [PoolState.Destroyed]: {}
 };
-class Pool {
+export class Pool {
+    get capacity() {
+        return this.maxInstances;
+    }
     get size() {
         return this.items.size;
     }
     constructor(options) {
         var _a, _b, _c, _d;
-        this.fsm = new extra_fsm_1.FiniteStateMachine(poolSchema, PoolState.Running);
-        this.waitingUsers = new structures_1.Queue();
+        this.fsm = new FiniteStateMachine(poolSchema, PoolState.Running);
+        this.waitingUsers = new Queue();
         this.items = new Set();
         this.createInstance = options.create;
         this.destroyInstance = options.destroy;
@@ -41,17 +40,15 @@ class Pool {
         this.concurrencyPerInstance = (_d = options.concurrencyPerInstance) !== null && _d !== void 0 ? _d : 1;
     }
     async use(fn) {
+        assert(this.fsm.matches(PoolState.Running), 'The pool is not available');
         const self = this;
-        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) {
+        const item = go(() => {
+            const candidateItems = toArray(filter(this.items, item => item.instance.users < this.concurrencyPerInstance));
+            if (isntEmptyArray(candidateItems)) {
                 return candidateItems.reduce((previous, current) => {
-                    if (current.instance.users < previous.instance.users) {
-                        return current;
-                    }
-                    else {
-                        return previous;
-                    }
+                    return current.instance.users < previous.instance.users
+                        ? current
+                        : previous;
                 });
             }
         });
@@ -60,13 +57,13 @@ class Pool {
         }
         else {
             if (this.items.size < this.maxInstances) {
-                const instance = new instance_1.Instance(this.createInstance, this.destroyInstance);
+                const instance = new Instance(this.createInstance, this.destroyInstance);
                 const item = { instance };
                 this.items.add(item);
                 return await useItem(item);
             }
             else {
-                const waitingUser = new extra_promise_1.Deferred();
+                const waitingUser = new Deferred();
                 this.waitingUsers.enqueue(waitingUser);
                 const item = await waitingUser;
                 return await useItem(item);
@@ -89,7 +86,7 @@ class Pool {
                     if (item.instance.users === 0 &&
                         self.items.size > self.minInstances) {
                         if (self.idleTimeout > 0) {
-                            item.cancelScheduledDeletion = (0, extra_timers_1.setTimeout)(self.idleTimeout, deleteInstance);
+                            item.cancelScheduledDeletion = setTimeout(self.idleTimeout, deleteInstance);
                         }
                         else {
                             await deleteInstance();
@@ -105,19 +102,15 @@ class Pool {
     }
     async destroy() {
         this.fsm.send('destroy');
-        for (const item of this.items) {
-            await item.instance.destroy();
-        }
+        await each(this.items, item => item.instance.destroy());
         this.items.clear();
-        let deferred;
-        while (deferred = this.waitingUsers.dequeue()) {
-            deferred.reject(new UnavailablePool());
+        let waitingUser;
+        while (waitingUser = this.waitingUsers.dequeue()) {
+            waitingUser.reject(new UnavailablePool());
         }
         this.fsm.send('destroyed');
     }
 }
-exports.Pool = Pool;
-class UnavailablePool extends errors_1.CustomError {
+export class UnavailablePool extends CustomError {
 }
-exports.UnavailablePool = UnavailablePool;
 //# sourceMappingURL=pool.js.map

package/lib/pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":";;;AAAA,+CAAgD;AAChD,iDAAmD;AACnD,uDAA8C;AAC9C,yCAA8C;AAC9C,iDAAwC;AACxC,yDAAmD;AACnD,+CAAyC;AACzC,yCAAoD;AA6CpD,IAAK,SAIJ;AAJD,WAAK,SAAS;IACZ,gCAAmB,CAAA;IACnB,sCAAyB,CAAA;IACzB,oCAAuB,CAAA;AACzB,CAAC,EAJI,SAAS,KAAT,SAAS,QAIb;AAMD,MAAM,UAAU,GAAG;IACjB,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QACnB,OAAO,EAAE,SAAS,CAAC,UAAU;KAC9B;IACD,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;QACtB,SAAS,EAAE,SAAS,CAAC,SAAS;KAC/B;IACD,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE;CAC1B,CAAA;AAED,MAAa,IAAI;IAcf,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAA;IACxB,CAAC;IAED,YAAY,OAAwB;;QAf5B,QAAG,GAAG,IAAI,8BAAkB,CAClC,UAAU,EACV,SAAS,CAAC,OAAO,CAClB,CAAA;QACO,iBAAY,GAAkC,IAAI,kBAAK,EAAE,CAAA;QACzD,UAAK,GAAsB,IAAI,GAAG,EAAE,CAAA;QAW1C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,MAAM,CAAA;QACpC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,CAAA;QACtC,IAAI,CAAC,YAAY,GAAG,MAAA,OAAO,CAAC,YAAY,mCAAI,QAAQ,CAAA;QACpD,IAAI,CAAC,YAAY,GAAG,MAAA,OAAO,CAAC,YAAY,mCAAI,CAAC,CAAA;QAC7C,IAAI,CAAC,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,CAAC,CAAA;QAC3C,IAAI,CAAC,sBAAsB,GAAG,MAAA,OAAO,CAAC,sBAAsB,mCAAI,CAAC,CAAA;IACnE,CAAC;IAMD,KAAK,CAAC,GAAG,CAAI,EAAiC;QAC5C,MAAM,IAAI,GAAG,IAAI,CAAA;QAEjB,MAAM,IAAI,GAAG,IAAA,YAAE,EAAC,GAAG,EAAE;YACnB,MAAM,cAAc,GAAG,IAAA,2BAAO,EAAC,IAAA,0BAAM,EACnC,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAC1D,CAAC,CAAA;YAEF,IAAI,cAAc,CAAC,MAAM,EAAE;gBACzB,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;oBACjD,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE;wBACpD,OAAO,OAAO,CAAA;qBACf;yBAAM;wBACL,OAAO,QAAQ,CAAA;qBAChB;gBACH,CAAC,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,IAAI,EAAE;YACR,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;SAC3B;aAAM;YACL,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE;gBACvC,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;gBACxE,MAAM,IAAI,GAAiB,EAAE,QAAQ,EAAE,CAAA;gBACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;gBACpB,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;aAC3B;iBAAM;gBACL,MAAM,WAAW,GAAG,IAAI,wBAAQ,EAAgB,CAAA;gBAChD,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;gBACtC,MAAM,IAAI,GAAG,MAAM,WAAW,CAAA;gBAC9B,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;aAC3B;SACF;QAED,KAAK,UAAU,OAAO,CAAC,IAAkB;YAEvC,IAAI,IAAI,CAAC,uBAAuB,EAAE;gBAChC,IAAI,CAAC,uBAAuB,EAAE,CAAA;gBAC9B,IAAI,CAAC,uBAAuB,GAAG,SAAS,CAAA;aACzC;YAED,IAAI;gBACF,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;aACnC;oBAAS;gBACR,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAA;gBAC/C,IAAI,WAAW,EAAE;oBACf,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;iBAC1B;qBAAM;oBACL,IACE,IAAI,CAAC,QAAQ,CAAC,KAAK,KAAK,CAAC;wBACzB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,EACnC;wBACA,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE;4BACxB,IAAI,CAAC,uBAAuB,GAAG,IAAA,yBAAU,EACvC,IAAI,CAAC,WAAW,EAChB,cAAc,CACf,CAAA;yBACF;6BAAM;4BACL,MAAM,cAAc,EAAE,CAAA;yBACvB;qBACF;iBACF;aACF;YAED,KAAK,UAAU,cAAc;gBAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBACvB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAA;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAExB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAA;SAC9B;QACD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;QAElB,IAAI,QAA4C,CAAA;QAChD,OAAO,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE;YAC7C,QAAQ,CAAC,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC,CAAA;SACvC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC5B,CAAC;CACF;AAvHD,oBAuHC;AAED,MAAa,eAAgB,SAAQ,oBAAW;CAAG;AAAnD,0CAAmD"}
+{"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.3",
+  "version": "0.1.5",
   "description": "A library that helps you create object/thread/connection pools",
   "keywords": [
     "pool",
@@ -12,57 +12,57 @@
     "lib",
     "src"
   ],
+  "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "sideEffects": false,
+  "engines": {
+    "node": ">=22"
+  },
   "repository": "git@github.com:BlackGlory/extra-pool.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
   "license": "MIT",
   "scripts": {
-    "deduplicate": "yarn-deduplicate",
+    "prepare": "ts-patch install -s",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
-    "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",
+    "test": "vitest run",
+    "prepublishOnly": "run-s prepare 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",
+    "build": "tsc --project tsconfig.build.json",
     "release": "standard-version"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "run-s lint build test",
+      "pre-commit": "run-s prepare lint build test",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "devDependencies": {
-    "@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",
+    "@commitlint/cli": "^20.4.2",
+    "@commitlint/config-conventional": "^20.4.2",
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.0.2",
     "husky": "^4.3.8",
-    "jest": "^29.3.1",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.2",
+    "return-style": "^4.0.0",
+    "rimraf": "^6.1.3",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.0.3",
-    "tscpaths": "^0.0.9",
-    "tslib": "^2.4.1",
-    "typescript": "^4.9.3",
-    "yarn-deduplicate": "^6.0.0"
+    "ts-patch": "^3.3.0",
+    "tslib": "^2.8.1",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.56.1",
+    "typescript-transform-paths": "^3.5.6",
+    "vite": "^7.3.1",
+    "vite-tsconfig-paths": "^6.1.1",
+    "vitest": "^4.0.18"
   },
   "dependencies": {
-    "@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": "^2.5.0",
-    "rxjs": "^7.5.7"
+    "@blackglory/prelude": "^0.4.0",
+    "@blackglory/structures": "^0.14.12",
+    "extra-fsm": "^0.2.1",
+    "extra-promise": "^7.1.1",
+    "extra-timers": "^0.3.0",
+    "iterable-operator": "^6.0.0",
+    "rxjs": "^7.8.2"
   }
 }

package/src/index.ts

@@ -1 +1 @@
-export * from './pool'
+export * from './pool.js'

package/src/instance.ts

@@ -1,33 +1,41 @@
-import { go, assert, Awaitable } from '@blackglory/prelude'
+import { Awaitable, NonEmptyArray, pass } from '@blackglory/prelude'
+import { ObservableFiniteStateMachine, IFiniteStateMachineSchema } from 'extra-fsm'
 import { Deferred } from 'extra-promise'
-import { ObservableFiniteStateMachine } from 'extra-fsm'
 import { firstValueFrom } from 'rxjs'
-import { filter } from 'rxjs/operators'
+import { filter, map } from 'rxjs/operators'
 
 export enum InstanceState {
-  Creating = 'creating'
-, Idle = 'idle'
-, Using = 'using'
-, Destroying = 'destroying'
-, Destroyed = 'destroyed'
+  Created
+, Initializing
+, Idle
+, Busy
+, Destroying
+, Destroyed
 }
 
 type InstanceEvent =
-| 'created'
+| 'init'
+| 'inited'
+| 'fail'
 | 'use'
 | 'idle'
 | 'destroy'
 | 'destroyed'
 
-const instanceSchema = {
-  [InstanceState.Creating]: {
-    created: InstanceState.Idle
+const instanceSchema: IFiniteStateMachineSchema<InstanceState, InstanceEvent> = {
+  [InstanceState.Created]: {
+    init: InstanceState.Initializing
+  , destroy: InstanceState.Destroyed
+  }
+, [InstanceState.Initializing]: {
+    inited: InstanceState.Idle
+  , fail: InstanceState.Created
   }
 , [InstanceState.Idle]: {
-    use: InstanceState.Using
+    use: InstanceState.Busy
   , destroy: InstanceState.Destroying
   }
-, [InstanceState.Using]: {
+, [InstanceState.Busy]: {
     idle: InstanceState.Idle
   }
 , [InstanceState.Destroying]: {
@@ -37,97 +45,180 @@ const instanceSchema = {
 }
 
 export class Instance<T> {
-  private fsm: ObservableFiniteStateMachine<InstanceState, InstanceEvent>
-  private _users = 0
-  readonly _instance: Deferred<T>
-
+  private fsm: ObservableFiniteStateMachine<
+    InstanceState
+  , InstanceEvent
+  > = new ObservableFiniteStateMachine(
+    instanceSchema
+  , InstanceState.Created
+  )
+
+  private deferredCreateInstance: Deferred<T> = createDeferred()
+  private deferredDestroyInstance: Deferred<void> = createDeferred()
+
+  #users = 0
   get users(): number {
-    return this._users
+    return this.#users
+  }
+
+  get state(): InstanceState {
+    return this.fsm.state
   }
 
   constructor(
-    createInstance: () => Awaitable<T>
+    private createInstance: () => Awaitable<T>
   , private destroyInstance?: (value: T) => Awaitable<void>
-  ) {
-    this._instance = new Deferred<T>()
-    this.fsm = new ObservableFiniteStateMachine<InstanceState, InstanceEvent>(
-      instanceSchema
-    , InstanceState.Creating
-    )
+  ) {}
+
+  async use<U>(fn: (instance: T) => Awaitable<U>): Promise<U> {
+    const self = this
+
+    switch (this.fsm.state) {
+      case InstanceState.Created: {
+        addUser()
+
+        try {
+          this.fsm.send('init')
+
+          let instance: T
+          try {
+            instance = await this.createInstance()
+            this.deferredCreateInstance.resolve(instance)
+
+            this.fsm.send('inited')
+          } catch (e) {
+            this.deferredCreateInstance.reject(e)
+            this.deferredCreateInstance = createDeferred()
 
-    go(async () => {
-      try {
-        const instance = await createInstance()
-        this.fsm.send('created')
-        this._instance.resolve(instance)
-      } catch (e) {
-        this._instance.reject(e)
+            this.fsm.send('fail')
+
+            throw e
+          }
+
+          this.fsm.send('use')
+          return await fn(instance)
+        } finally {
+          removeUser()
+        }
       }
-    })
-  }
+      case InstanceState.Initializing: {
+        addUser()
 
-  async waitForCreated(): Promise<void> {
-    await this._instance
-  }
+        try {
+          const instance = await this.deferredCreateInstance
 
-  getState(): InstanceState {
-    return this.fsm.state
-  }
+          // 由导致初始化的调用将负责状态转换.
 
-  async use<U>(fn: (instance: T) => Awaitable<U>): Promise<U> {
-    // 不要尝试将此处的代码改编成switch管道, 很难正确编写.
+          return await fn(instance)
+        } finally {
+          removeUser()
+        }
+      }
+      case InstanceState.Idle: {
+        addUser()
 
-    assert(
-      this.fsm.state !== InstanceState.Destroying &&
-      this.fsm.state !== InstanceState.Destroyed
-    , 'The instance is not available'
-    )
+        try {
+          this.fsm.send('use')
+
+          const instance = await this.deferredCreateInstance
+
+          return await fn(instance)
+        } finally {
+          removeUser()
+        }
+      }
+      case InstanceState.Busy: {
+        addUser()
 
-    this._users++
+        try {
+          const instance = await this.deferredCreateInstance
 
-    if (this.fsm.state === InstanceState.Creating) {
-      await this._instance
+          return await fn(instance)
+        } finally {
+          removeUser()
+        }
+      }
+      case InstanceState.Destroying:
+      case InstanceState.Destroyed: throw new Error('The instance is not available')
+      default: throw new Error(`Unhandled state`)
     }
 
-    if (this.fsm.state === InstanceState.Idle) {
-      this.fsm.send('use')
+    function addUser(): void {
+      self.#users++
     }
 
-    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')
+    function removeUser(): void {
+      if ((--self.#users) === 0) {
+        if (self.fsm.can('idle')) self.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)
+    switch (this.fsm.state) {
+      case InstanceState.Created: {
+        this.fsm.send('destroy')
+
+        return
+      }
+      case InstanceState.Initializing: {
+        await this.waitForState(
+          InstanceState.Idle
+        , InstanceState.Created
         )
-      )
+
+        return await this.destroy()
+      }
+      case InstanceState.Idle: {
+        this.fsm.send('destroy')
+
+        const instance = await this.deferredCreateInstance
+
+        try {
+          await this.destroyInstance?.(instance)
+        } catch (e) {
+          // 如果destroy过程中出错, 之后的所有destroy调用都会抛出相同错误.
+          // 此实例的状态将停留在Destroying, 这是预期行为.
+          this.deferredDestroyInstance.reject(e)
+
+          throw e
+        }
+
+        this.fsm.send('destroyed')
+
+        this.deferredDestroyInstance.resolve()
+
+        return
+      }
+      case InstanceState.Busy: {
+        await this.waitForState(InstanceState.Idle)
+
+        return await this.destroy()
+      }
+      case InstanceState.Destroying: {
+        await this.deferredDestroyInstance
+
+        return
+      }
+      case InstanceState.Destroyed: return
+      default: throw new Error(`Unhandled state`)
     }
+  }
 
-    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)
-        )
+  async waitForState<States extends NonEmptyArray<InstanceState>>(
+    ...states: States
+  ): Promise<States[number]> {
+    return await firstValueFrom(
+      this.fsm.observeStateChanges().pipe(
+        map(change => change.newState)
+      , filter(newState => states.includes(newState))
       )
-    }
+    )
   }
 }
+
+function createDeferred<T>(): Deferred<T> {
+  const deferred = new Deferred<T>()
+  Promise.resolve(deferred).catch(pass)
+  return deferred
+}

package/src/pool.ts

@@ -1,11 +1,10 @@
-import { CustomError } from '@blackglory/errors'
-import { go, Awaitable } from '@blackglory/prelude'
+import { go, Awaitable, CustomError, isntEmptyArray, assert } from '@blackglory/prelude'
 import { Queue } from '@blackglory/structures'
-import { FiniteStateMachine } from 'extra-fsm'
-import { Deferred } from 'extra-promise'
+import { FiniteStateMachine, IFiniteStateMachineSchema } from 'extra-fsm'
+import { Deferred, each } from 'extra-promise'
 import { toArray, filter } from 'iterable-operator'
 import { setTimeout } from 'extra-timers'
-import { Instance, InstanceState } from './instance'
+import { Instance } from './instance.js'
 
 interface IPoolOptions<T> {
   create: () => Awaitable<T>
@@ -51,16 +50,16 @@ interface IPoolItem<T> {
 }
 
 enum PoolState {
-  Running = 'running'
-, Destroying = 'destroying'
-, Destroyed = 'destroyed'
+  Running
+, Destroying
+, Destroyed
 }
 
 type PoolEvent =
 | 'destroy'
 | 'destroyed'
 
-const poolSchema = {
+const poolSchema: IFiniteStateMachineSchema<PoolState, PoolEvent> = {
   [PoolState.Running]: {
     destroy: PoolState.Destroying
   }
@@ -71,18 +70,25 @@ const poolSchema = {
 }
 
 export class Pool<T> {
-  private createInstance: () => Awaitable<T>
-  private destroyInstance?: (value: T) => Awaitable<void>
-  private fsm = new FiniteStateMachine<PoolState, PoolEvent>(
+  private readonly createInstance: () => Awaitable<T>
+  private readonly destroyInstance?: (value: T) => Awaitable<void>
+  private readonly fsm: FiniteStateMachine<
+    PoolState
+  , PoolEvent
+  > = new FiniteStateMachine(
     poolSchema
   , PoolState.Running
   )
-  private waitingUsers: Queue<Deferred<IPoolItem<T>>> = new Queue()
-  private items: Set<IPoolItem<T>> = new Set()
-  private maxInstances: number
-  private minInstances: number
-  private idleTimeout: number
-  private concurrencyPerInstance: number
+  private readonly waitingUsers: Queue<Deferred<IPoolItem<T>>> = new Queue()
+  private readonly items: Set<IPoolItem<T>> = new Set()
+  private readonly maxInstances: number
+  private readonly minInstances: number
+  private readonly idleTimeout: number
+  private readonly concurrencyPerInstance: number
+
+  get capacity(): number {
+    return this.maxInstances
+  }
 
   get size(): number {
     return this.items.size
@@ -102,6 +108,8 @@ export class Pool<T> {
    * 函数的使用者应该尊重阻塞, 否则会意外制造大量非必要的Promise.
    */
   async use<U>(fn: (instance: T) => Awaitable<U>): Promise<U> {
+    assert(this.fsm.matches(PoolState.Running), 'The pool is not available')
+
     const self = this
 
     const item = go(() => {
@@ -110,13 +118,12 @@ export class Pool<T> {
       , item => item.instance.users < this.concurrencyPerInstance
       ))
 
-      if (candidateItems.length) {
+      if (isntEmptyArray(candidateItems)) {
+        // 找到负载最低(用户量最少)的项目.
         return candidateItems.reduce((previous, current) => {
-          if (current.instance.users < previous.instance.users) {
-            return current
-          } else {
-            return previous
-          }
+          return current.instance.users < previous.instance.users
+               ? current
+               : previous
         })
       }
     })
@@ -177,14 +184,12 @@ export class Pool<T> {
   async destroy(): Promise<void> {
     this.fsm.send('destroy')
 
-    for (const item of this.items) {
-      await item.instance.destroy()
-    }
+    await each(this.items, item => item.instance.destroy())
     this.items.clear()
 
-    let deferred: Deferred<IPoolItem<T>> | undefined
-    while (deferred = this.waitingUsers.dequeue()) {
-      deferred.reject(new UnavailablePool())
+    let waitingUser: Deferred<IPoolItem<T>> | undefined
+    while (waitingUser = this.waitingUsers.dequeue()) {
+      waitingUser.reject(new UnavailablePool())
     }
 
     this.fsm.send('destroyed')