@loopback/core 1.10.6 → 1.12.1

package/CHANGELOG.md

@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.1](https://github.com/strongloop/loopback-next/compare/@loopback/core@1.12.0...@loopback/core@1.12.1) (2020-01-07)
+
+**Note:** Version bump only for package @loopback/core
+
+
+
+
+
+# [1.12.0](https://github.com/strongloop/loopback-next/compare/@loopback/core@1.11.0...@loopback/core@1.12.0) (2019-12-09)
+
+
+### Features
+
+* **core:** allow application to trap shutdown signals ([2130634](https://github.com/strongloop/loopback-next/commit/213063424c2690aa7ef3f4494d8fc2a7e593b883))
+* **core:** emit stateChanged events for application state transitions ([5257a8f](https://github.com/strongloop/loopback-next/commit/5257a8f68525921028b98a340c75758725d256b9))
+* **core:** enable start/stop/boot to be idempotent ([b614a78](https://github.com/strongloop/loopback-next/commit/b614a7825be1dc1875556388443f72385525fa29))
+* **core:** improve application states for start/stop ([01dac15](https://github.com/strongloop/loopback-next/commit/01dac151260e6c743cc77863f6495a85d19d338c))
+* **core:** simplify state management by checking in process states ([874d2b3](https://github.com/strongloop/loopback-next/commit/874d2b385dd8c1dbf3d3980118898c6b99f145aa))
+
+
+
+
+
+# [1.11.0](https://github.com/strongloop/loopback-next/compare/@loopback/core@1.10.7...@loopback/core@1.11.0) (2019-11-25)
+
+
+### Features
+
+* **core:** add [@service](https://github.com/service) decorator to inject a service by class/interface ([1d80904](https://github.com/strongloop/loopback-next/commit/1d80904b670724b00cb6a2965b8472f44d23eed0))
+
+
+
+
+
+## [1.10.7](https://github.com/strongloop/loopback-next/compare/@loopback/core@1.10.6...@loopback/core@1.10.7) (2019-11-12)
+
+**Note:** Version bump only for package @loopback/core
+
+
+
+
+
 ## [1.10.6](https://github.com/strongloop/loopback-next/compare/@loopback/core@1.10.5...@loopback/core@1.10.6) (2019-10-24)
 
 **Note:** Version bump only for package @loopback/core

package/dist/application.d.ts

@@ -1,7 +1,9 @@
+/// <reference types="node" />
 import { Binding, Constructor, Context, Provider } from '@loopback/context';
 import { Component } from './component';
 import { LifeCycleObserver } from './lifecycle';
 import { Server } from './server';
+import { ServiceOptions } from './service';
 /**
  * Application is the container for various types of artifacts, such as
  * components, servers, controllers, repositories, datasources, connectors,
@@ -9,6 +11,34 @@ import { Server } from './server';
  */
 export declare class Application extends Context implements LifeCycleObserver {
     readonly options: ApplicationConfig;
+    /**
+     * A flag to indicate that the application is being shut down
+     */
+    private _isShuttingDown;
+    /**
+     * State of the application
+     */
+    private _state;
+    /**
+     * Get the state of the application. The initial state is `created` and it can
+     * transition as follows by `start` and `stop`:
+     *
+     * 1. start
+     *   - !started -> starting -> started
+     *   - started -> started (no-op)
+     * 2. stop
+     *   - started -> stopping -> stopped
+     *   - !started -> stopped (no-op)
+     *
+     * Two types of states are expected:
+     * - stable, such as `started` and `stopped`
+     * - in process, such as `booting` and `starting`
+     *
+     * Operations such as `start` and `stop` can only be called at a stable state.
+     * The logic should immediately set the state to a new one indicating work in
+     * process, such as `starting` and `stopping`.
+     */
+    get state(): string;
     /**
      * Create an application with the given parent context
      * @param parent - Parent context
@@ -91,11 +121,37 @@ export declare class Application extends Context implements LifeCycleObserver {
      */
     getServer<T extends Server>(target: Constructor<T> | string): Promise<T>;
     /**
-     * Start the application, and all of its registered observers.
+     * Assert there is no other operation is in progress, i.e., the state is not
+     * `*ing`, such as `starting` or `stopping`.
+     *
+     * @param op - The operation name, such as 'boot', 'start', or 'stop'
+     */
+    protected assertNotInProcess(op: string): void;
+    /**
+     * Assert current state of the application to be one of the expected values
+     * @param op - The operation name, such as 'boot', 'start', or 'stop'
+     * @param states - Valid states
+     */
+    protected assertInStates(op: string, ...states: string[]): void;
+    /**
+     * Transition the application to a new state and emit an event
+     * @param state - The new state
+     */
+    protected setState(state: string): void;
+    protected awaitState(state: string): Promise<void>;
+    /**
+     * Start the application, and all of its registered observers. The application
+     * state is checked to ensure the integrity of `start`.
+     *
+     * If the application is already started, no operation is performed.
      */
     start(): Promise<void>;
     /**
-     * Stop the application instance and all of its registered observers.
+     * Stop the application instance and all of its registered observers. The
+     * application state is checked to ensure the integrity of `stop`.
+     *
+     * If the application is already stopped or not started, no operation is
+     * performed.
      */
     stop(): Promise<void>;
     private getLifeCycleObserverRegistry;
@@ -177,12 +233,36 @@ export declare class Application extends Context implements LifeCycleObserver {
      * }
      * ```
      */
-    service<S>(cls: Constructor<S> | Constructor<Provider<S>>, name?: string): Binding<S>;
+    service<S>(cls: Constructor<S> | Constructor<Provider<S>>, name?: string | ServiceOptions): Binding<S>;
+    /**
+     * Set up signals that are captured to shutdown the application
+     * @param signals - An array of signals to be trapped
+     * @param gracePeriod - A grace period in ms before forced exit
+     */
+    protected setupShutdown(signals: NodeJS.Signals[], gracePeriod?: number): void;
 }
+/**
+ * Options to set up application shutdown
+ */
+export declare type ShutdownOptions = {
+    /**
+     * An array of signals to be trapped for graceful shutdown
+     */
+    signals?: NodeJS.Signals[];
+    /**
+     * Period in milliseconds to wait for the grace shutdown to finish before
+     * exiting the process
+     */
+    gracePeriod?: number;
+};
 /**
  * Configuration for application
  */
 export interface ApplicationConfig {
+    /**
+     * Configuration for signals that shut down the application
+     */
+    shutdown?: ShutdownOptions;
     /**
      * Other properties
      */

package/dist/application.js

@@ -3,14 +3,20 @@
 // Node module: @loopback/core
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const context_1 = require("@loopback/context");
-const debugFactory = require("debug");
+const assert_1 = __importDefault(require("assert"));
+const p_event_1 = __importDefault(require("p-event"));
+const debug_1 = __importDefault(require("debug"));
 const component_1 = require("./component");
 const keys_1 = require("./keys");
 const lifecycle_1 = require("./lifecycle");
 const lifecycle_registry_1 = require("./lifecycle-registry");
-const debug = debugFactory('loopback:core:application');
+const service_1 = require("./service");
+const debug = debug_1.default('loopback:core:application');
 /**
  * Application is the container for various types of artifacts, such as
  * components, servers, controllers, repositories, datasources, connectors,
@@ -18,10 +24,19 @@ const debug = debugFactory('loopback:core:application');
  */
 class Application extends context_1.Context {
     constructor(configOrParent, parent) {
+        var _a, _b;
         super(configOrParent instanceof context_1.Context ? configOrParent : parent, 'application');
+        /**
+         * A flag to indicate that the application is being shut down
+         */
+        this._isShuttingDown = false;
+        /**
+         * State of the application
+         */
+        this._state = 'created';
         if (configOrParent instanceof context_1.Context)
             configOrParent = {};
-        this.options = configOrParent || {};
+        this.options = (configOrParent !== null && configOrParent !== void 0 ? configOrParent : {});
         // Bind the life cycle observer registry
         this.bind(keys_1.CoreBindings.LIFE_CYCLE_OBSERVER_REGISTRY)
             .toClass(lifecycle_registry_1.LifeCycleObserverRegistry)
@@ -30,6 +45,30 @@ class Application extends context_1.Context {
         this.bind(keys_1.CoreBindings.APPLICATION_INSTANCE).to(this);
         // Make options available to other modules as well.
         this.bind(keys_1.CoreBindings.APPLICATION_CONFIG).to(this.options);
+        const shutdownConfig = (_a = this.options.shutdown, (_a !== null && _a !== void 0 ? _a : {}));
+        this.setupShutdown((_b = shutdownConfig.signals, (_b !== null && _b !== void 0 ? _b : ['SIGTERM'])), shutdownConfig.gracePeriod);
+    }
+    /**
+     * Get the state of the application. The initial state is `created` and it can
+     * transition as follows by `start` and `stop`:
+     *
+     * 1. start
+     *   - !started -> starting -> started
+     *   - started -> started (no-op)
+     * 2. stop
+     *   - started -> stopping -> stopped
+     *   - !started -> stopped (no-op)
+     *
+     * Two types of states are expected:
+     * - stable, such as `started` and `stopped`
+     * - in process, such as `booting` and `starting`
+     *
+     * Operations such as `start` and `stop` can only be called at a stable state.
+     * The logic should immediately set the state to a new one indicating work in
+     * process, such as `starting` and `stopping`.
+     */
+    get state() {
+        return this._state;
     }
     /**
      * Register a controller class with this application.
@@ -49,7 +88,7 @@ class Application extends context_1.Context {
      * ```
      */
     controller(controllerCtor, name) {
-        debug('Adding controller %s', name || controllerCtor.name);
+        debug('Adding controller %s', (name !== null && name !== void 0 ? name : controllerCtor.name));
         const binding = context_1.createBindingFromClass(controllerCtor, {
             name,
             namespace: keys_1.CoreBindings.CONTROLLERS,
@@ -78,7 +117,7 @@ class Application extends context_1.Context {
      *
      */
     server(ctor, name) {
-        debug('Adding server %s', name || ctor.name);
+        debug('Adding server %s', (name !== null && name !== void 0 ? name : ctor.name));
         const binding = context_1.createBindingFromClass(ctor, {
             name,
             namespace: keys_1.CoreBindings.SERVERS,
@@ -135,18 +174,73 @@ class Application extends context_1.Context {
         return this.get(key);
     }
     /**
-     * Start the application, and all of its registered observers.
+     * Assert there is no other operation is in progress, i.e., the state is not
+     * `*ing`, such as `starting` or `stopping`.
+     *
+     * @param op - The operation name, such as 'boot', 'start', or 'stop'
+     */
+    assertNotInProcess(op) {
+        assert_1.default(!this._state.endsWith('ing'), `Cannot ${op} the application as it is ${this._state}.`);
+    }
+    /**
+     * Assert current state of the application to be one of the expected values
+     * @param op - The operation name, such as 'boot', 'start', or 'stop'
+     * @param states - Valid states
+     */
+    assertInStates(op, ...states) {
+        assert_1.default(states.includes(this._state), `Cannot ${op} the application as it is ${this._state}. Valid states are ${states}.`);
+    }
+    /**
+     * Transition the application to a new state and emit an event
+     * @param state - The new state
+     */
+    setState(state) {
+        const oldState = this._state;
+        this._state = state;
+        if (oldState !== state) {
+            this.emit('stateChanged', { from: oldState, to: this._state });
+            this.emit(state);
+        }
+    }
+    async awaitState(state) {
+        await p_event_1.default(this, state);
+    }
+    /**
+     * Start the application, and all of its registered observers. The application
+     * state is checked to ensure the integrity of `start`.
+     *
+     * If the application is already started, no operation is performed.
      */
     async start() {
+        if (this._state === 'starting')
+            return this.awaitState('started');
+        this.assertNotInProcess('start');
+        // No-op if it's started
+        if (this._state === 'started')
+            return;
+        this.setState('starting');
         const registry = await this.getLifeCycleObserverRegistry();
         await registry.start();
+        this.setState('started');
     }
     /**
-     * Stop the application instance and all of its registered observers.
+     * Stop the application instance and all of its registered observers. The
+     * application state is checked to ensure the integrity of `stop`.
+     *
+     * If the application is already stopped or not started, no operation is
+     * performed.
      */
     async stop() {
+        if (this._state === 'stopping')
+            return this.awaitState('stopped');
+        this.assertNotInProcess('stop');
+        // No-op if it's created or stopped
+        if (this._state !== 'started')
+            return;
+        this.setState('stopping');
         const registry = await this.getLifeCycleObserverRegistry();
         await registry.stop();
+        this.setState('stopped');
     }
     async getLifeCycleObserverRegistry() {
         return this.get(keys_1.CoreBindings.LIFE_CYCLE_OBSERVER_REGISTRY);
@@ -174,7 +268,7 @@ class Application extends context_1.Context {
      * ```
      */
     component(componentCtor, name) {
-        debug('Adding component: %s', name || componentCtor.name);
+        debug('Adding component: %s', (name !== null && name !== void 0 ? name : componentCtor.name));
         const binding = context_1.createBindingFromClass(componentCtor, {
             name,
             namespace: keys_1.CoreBindings.COMPONENTS,
@@ -205,7 +299,7 @@ class Application extends context_1.Context {
      * @param name - Optional name for the life cycle observer
      */
     lifeCycleObserver(ctor, name) {
-        debug('Adding life cycle observer %s', name || ctor.name);
+        debug('Adding life cycle observer %s', (name !== null && name !== void 0 ? name : ctor.name));
         const binding = context_1.createBindingFromClass(ctor, {
             name,
             namespace: keys_1.CoreBindings.LIFE_CYCLE_OBSERVERS,
@@ -258,24 +352,43 @@ class Application extends context_1.Context {
      * ```
      */
     service(cls, name) {
-        if (!name && context_1.isProviderClass(cls)) {
-            // Trim `Provider` from the default service name
-            // This is needed to keep backward compatibility
-            const templateFn = context_1.bindingTemplateFor(cls);
-            const template = context_1.Binding.bind('template').apply(templateFn);
-            if (template.tagMap[context_1.ContextTags.PROVIDER] &&
-                !template.tagMap[context_1.ContextTags.NAME]) {
-                // The class is a provider and no `name` tag is found
-                name = cls.name.replace(/Provider$/, '');
-            }
-        }
-        const binding = context_1.createBindingFromClass(cls, {
-            name,
-            type: 'service',
-        });
+        const options = typeof name === 'string' ? { name } : name;
+        const binding = service_1.createServiceBinding(cls, options);
         this.add(binding);
         return binding;
     }
+    /**
+     * Set up signals that are captured to shutdown the application
+     * @param signals - An array of signals to be trapped
+     * @param gracePeriod - A grace period in ms before forced exit
+     */
+    setupShutdown(signals, gracePeriod) {
+        const cleanup = async (signal) => {
+            const kill = () => {
+                // eslint-disable-next-line @typescript-eslint/no-misused-promises
+                signals.forEach(sig => process.removeListener(sig, cleanup));
+                process.kill(process.pid, signal);
+            };
+            debug('Signal %s received for process %d', signal, process.pid);
+            if (!this._isShuttingDown) {
+                this._isShuttingDown = true;
+                let timer;
+                if (typeof gracePeriod === 'number' && !isNaN(gracePeriod)) {
+                    timer = setTimeout(kill, gracePeriod);
+                }
+                try {
+                    await this.stop();
+                }
+                finally {
+                    if (timer != null)
+                        clearTimeout(timer);
+                    kill();
+                }
+            }
+        };
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        signals.forEach(sig => process.on(sig, cleanup));
+    }
 }
 exports.Application = Application;
 //# sourceMappingURL=application.js.map

package/dist/application.js.map

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

package/dist/extension-point.js

@@ -53,9 +53,7 @@ exports.extensionPoint = extensionPoint;
  */
 function extensions(extensionPointName) {
     return context_1.inject('', { decorator: '@extensions' }, (ctx, injection, session) => {
-        extensionPointName =
-            extensionPointName ||
-                inferExtensionPointName(injection.target, session.currentBinding);
+        extensionPointName = (extensionPointName !== null && extensionPointName !== void 0 ? extensionPointName : inferExtensionPointName(injection.target, session.currentBinding));
         const bindingFilter = extensionFilter(extensionPointName);
         return context_1.createViewGetter(ctx, bindingFilter, injection.metadata.bindingComparator, session);
     });

package/dist/extension-point.js.map

@@ -1 +1 @@
-{"version":3,"file":"extension-point.js","sourceRoot":"","sources":["../src/extension-point.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;AAEhE,+CAa2B;AAC3B,iCAAgC;AAEhC;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,cAAc,CAAC,IAAY,EAAE,GAAG,KAAoB;IAClE,OAAO,cAAI,CAAC,EAAC,IAAI,EAAE,EAAC,CAAC,eAAQ,CAAC,eAAe,CAAC,EAAE,IAAI,EAAC,EAAC,EAAE,GAAG,KAAK,CAAC,CAAC;AACpE,CAAC;AAFD,wCAEC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,SAAgB,UAAU,CAAC,kBAA2B;IACpD,OAAO,gBAAM,CAAC,EAAE,EAAE,EAAC,SAAS,EAAE,aAAa,EAAC,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QACxE,kBAAkB;YAChB,kBAAkB;gBAClB,uBAAuB,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QAEpE,MAAM,aAAa,GAAG,eAAe,CAAC,kBAAkB,CAAC,CAAC;QAC1D,OAAO,0BAAgB,CACrB,GAAG,EACH,aAAa,EACb,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EACpC,OAAO,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,gCAcC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAC9B,eAAuB,EACvB,cAA2C;IAE3C,IAAI,cAAc,EAAE;QAClB,MAAM,IAAI,GACR,cAAc,CAAC,MAAM,CAAC,eAAQ,CAAC,eAAe,CAAC;YAC/C,cAAc,CAAC,MAAM,CAAC,qBAAW,CAAC,IAAI,CAAC,CAAC;QAE1C,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;KACvB;IAED,IAAI,MAAgB,CAAC;IACrB,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;QACzC,wBAAwB;QACxB,MAAM,GAAG,eAAe,CAAC;KAC1B;SAAM;QACL,6BAA6B;QAC7B,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC;KACtC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,kBAA0B;IACxD,OAAO,qBAAW,CAAC;QACjB,CAAC,eAAQ,CAAC,aAAa,CAAC,EAAE,kBAAkB;KAC7C,CAAC,CAAC;AACL,CAAC;AAJD,0CAIC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,kBAA0B;IACrD,OAAO,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC,CAAC,eAAQ,CAAC,aAAa,CAAC,EAAE,kBAAkB,EAAC,CAAC,CAAC;AAChF,CAAC;AAFD,oCAEC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,kBAA0B,EAC1B,cAAoC,EACpC,OAAiC;IAEjC,MAAM,OAAO,GAAG,gCAAsB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,KAAK,CACnE,YAAY,CAAC,kBAAkB,CAAC,CACjC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,OAAO,OAAO,CAAC;AACjB,CAAC;AAXD,oCAWC"}
+{"version":3,"file":"extension-point.js","sourceRoot":"","sources":["../src/extension-point.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;AAEhE,+CAa2B;AAC3B,iCAAgC;AAEhC;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,cAAc,CAAC,IAAY,EAAE,GAAG,KAAoB;IAClE,OAAO,cAAI,CAAC,EAAC,IAAI,EAAE,EAAC,CAAC,eAAQ,CAAC,eAAe,CAAC,EAAE,IAAI,EAAC,EAAC,EAAE,GAAG,KAAK,CAAC,CAAC;AACpE,CAAC;AAFD,wCAEC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,SAAgB,UAAU,CAAC,kBAA2B;IACpD,OAAO,gBAAM,CAAC,EAAE,EAAE,EAAC,SAAS,EAAE,aAAa,EAAC,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;QACxE,kBAAkB,IAChB,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAClB,uBAAuB,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA,CAAC;QAEpE,MAAM,aAAa,GAAG,eAAe,CAAC,kBAAkB,CAAC,CAAC;QAC1D,OAAO,0BAAgB,CACrB,GAAG,EACH,aAAa,EACb,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EACpC,OAAO,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,gCAcC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAC9B,eAAuB,EACvB,cAA2C;IAE3C,IAAI,cAAc,EAAE;QAClB,MAAM,IAAI,GACR,cAAc,CAAC,MAAM,CAAC,eAAQ,CAAC,eAAe,CAAC;YAC/C,cAAc,CAAC,MAAM,CAAC,qBAAW,CAAC,IAAI,CAAC,CAAC;QAE1C,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;KACvB;IAED,IAAI,MAAgB,CAAC;IACrB,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;QACzC,wBAAwB;QACxB,MAAM,GAAG,eAAe,CAAC;KAC1B;SAAM;QACL,6BAA6B;QAC7B,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC;KACtC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,kBAA0B;IACxD,OAAO,qBAAW,CAAC;QACjB,CAAC,eAAQ,CAAC,aAAa,CAAC,EAAE,kBAAkB;KAC7C,CAAC,CAAC;AACL,CAAC;AAJD,0CAIC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,kBAA0B;IACrD,OAAO,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC,CAAC,eAAQ,CAAC,aAAa,CAAC,EAAE,kBAAkB,EAAC,CAAC,CAAC;AAChF,CAAC;AAFD,oCAEC;AAED;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,OAAgB,EAChB,kBAA0B,EAC1B,cAAoC,EACpC,OAAiC;IAEjC,MAAM,OAAO,GAAG,gCAAsB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,KAAK,CACnE,YAAY,CAAC,kBAAkB,CAAC,CACjC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,OAAO,OAAO,CAAC;AACjB,CAAC;AAXD,oCAWC"}

package/dist/index.d.ts

@@ -6,3 +6,4 @@ export * from './keys';
 export * from './lifecycle';
 export * from './lifecycle-registry';
 export * from './server';
+export * from './service';

package/dist/index.js

@@ -16,4 +16,5 @@ __export(require("./extension-point"));
 __export(require("./keys"));
 __export(require("./lifecycle"));
 __export(require("./lifecycle-registry"));
+__export(require("./service"));
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;;AAEhE,qDAAqD;AACrD,uCAAkC;AAElC,cAAc;AACd,mCAA8B;AAC9B,iCAA4B;AAC5B,uCAAkC;AAClC,4BAAuB;AACvB,iCAA4B;AAC5B,0CAAqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;;;AAEhE,qDAAqD;AACrD,uCAAkC;AAElC,cAAc;AACd,mCAA8B;AAC9B,iCAA4B;AAC5B,uCAAkC;AAClC,4BAAuB;AACvB,iCAA4B;AAC5B,0CAAqC;AAErC,+BAA0B"}

package/dist/keys.d.ts

@@ -73,6 +73,10 @@ export declare namespace CoreTags {
      * Binding tag for services
      */
     const SERVICE = "service";
+    /**
+     * Binding tag for the service interface
+     */
+    const SERVICE_INTERFACE = "serviceInterface";
     /**
      * Binding tag for life cycle observers
      */

package/dist/keys.js

@@ -83,6 +83,10 @@ var CoreTags;
      * Binding tag for services
      */
     CoreTags.SERVICE = 'service';
+    /**
+     * Binding tag for the service interface
+     */
+    CoreTags.SERVICE_INTERFACE = 'serviceInterface';
     /**
      * Binding tag for life cycle observers
      */

package/dist/keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"keys.js","sourceRoot":"","sources":["../src/keys.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;AAEhE,+CAA6C;AAY7C;;GAEG;AACH,IAAiB,YAAY,CAgF5B;AAhFD,WAAiB,YAAY;IAC3B,cAAc;IACd;;OAEG;IACU,iCAAoB,GAAG,oBAAU,CAAC,MAAM,CACnD,sBAAsB,CACvB,CAAC;IAEF;;OAEG;IACU,+BAAkB,GAAG,oBAAU,CAAC,MAAM,CACjD,oBAAoB,CACrB,CAAC;IAEF;;OAEG;IACU,iCAAoB,GAAG,oBAAU,CAAC,MAAM,CACnD,sBAAsB,CACvB,CAAC;IAEF,SAAS;IACT;;OAEG;IACU,oBAAO,GAAG,SAAS,CAAC;IAEjC,YAAY;IACZ;;OAEG;IACU,uBAAU,GAAG,YAAY,CAAC;IAEvC,aAAa;IACA,wBAAW,GAAG,aAAa,CAAC;IAEzC;;;OAGG;IACU,6BAAgB,GAAG,oBAAU,CAAC,MAAM,CAC/C,yBAAyB,CAC1B,CAAC;IAEF;;;OAGG;IACU,mCAAsB,GAAG,oBAAU,CAAC,MAAM,CACrD,8BAA8B,CAC/B,CAAC;IAEF;;;OAGG;IACU,mCAAsB,GAAG,wBAAwB,CAAC;IAE/D;;;OAGG;IACU,+BAAkB,GAAG,oBAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAE7D,iCAAoB,GAAG,oBAAoB,CAAC;IACzD;;OAEG;IACU,yCAA4B,GAAG,oBAAU,CAAC,MAAM,CAE3D,4BAA4B,CAAC,CAAC;IAEhC;;OAEG;IACU,wCAA2B,GAAG,oBAAU,CAAC,MAAM,CAE1D,2BAA2B,CAAC,CAAC;AACjC,CAAC,EAhFgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAgF5B;AAED,IAAiB,QAAQ,CAyCxB;AAzCD,WAAiB,QAAQ;IACvB;;OAEG;IACU,kBAAS,GAAG,WAAW,CAAC;IAErC;;OAEG;IACU,eAAM,GAAG,QAAQ,CAAC;IAE/B;;OAEG;IACU,mBAAU,GAAG,YAAY,CAAC;IAEvC;;OAEG;IACU,gBAAO,GAAG,SAAS,CAAC;IAEjC;;OAEG;IACU,4BAAmB,GAAG,mBAAmB,CAAC;IAEvD;;OAEG;IACU,kCAAyB,GAAG,wBAAwB,CAAC;IAElE;;;OAGG;IACU,sBAAa,GAAG,cAAc,CAAC;IAE5C;;OAEG;IACU,wBAAe,GAAG,gBAAgB,CAAC;AAClD,CAAC,EAzCgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAyCxB"}
+{"version":3,"file":"keys.js","sourceRoot":"","sources":["../src/keys.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;AAEhE,+CAA6C;AAY7C;;GAEG;AACH,IAAiB,YAAY,CAgF5B;AAhFD,WAAiB,YAAY;IAC3B,cAAc;IACd;;OAEG;IACU,iCAAoB,GAAG,oBAAU,CAAC,MAAM,CACnD,sBAAsB,CACvB,CAAC;IAEF;;OAEG;IACU,+BAAkB,GAAG,oBAAU,CAAC,MAAM,CACjD,oBAAoB,CACrB,CAAC;IAEF;;OAEG;IACU,iCAAoB,GAAG,oBAAU,CAAC,MAAM,CACnD,sBAAsB,CACvB,CAAC;IAEF,SAAS;IACT;;OAEG;IACU,oBAAO,GAAG,SAAS,CAAC;IAEjC,YAAY;IACZ;;OAEG;IACU,uBAAU,GAAG,YAAY,CAAC;IAEvC,aAAa;IACA,wBAAW,GAAG,aAAa,CAAC;IAEzC;;;OAGG;IACU,6BAAgB,GAAG,oBAAU,CAAC,MAAM,CAC/C,yBAAyB,CAC1B,CAAC;IAEF;;;OAGG;IACU,mCAAsB,GAAG,oBAAU,CAAC,MAAM,CACrD,8BAA8B,CAC/B,CAAC;IAEF;;;OAGG;IACU,mCAAsB,GAAG,wBAAwB,CAAC;IAE/D;;;OAGG;IACU,+BAAkB,GAAG,oBAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAE7D,iCAAoB,GAAG,oBAAoB,CAAC;IACzD;;OAEG;IACU,yCAA4B,GAAG,oBAAU,CAAC,MAAM,CAE3D,4BAA4B,CAAC,CAAC;IAEhC;;OAEG;IACU,wCAA2B,GAAG,oBAAU,CAAC,MAAM,CAE1D,2BAA2B,CAAC,CAAC;AACjC,CAAC,EAhFgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAgF5B;AAED,IAAiB,QAAQ,CA6CxB;AA7CD,WAAiB,QAAQ;IACvB;;OAEG;IACU,kBAAS,GAAG,WAAW,CAAC;IAErC;;OAEG;IACU,eAAM,GAAG,QAAQ,CAAC;IAE/B;;OAEG;IACU,mBAAU,GAAG,YAAY,CAAC;IAEvC;;OAEG;IACU,gBAAO,GAAG,SAAS,CAAC;IACjC;;OAEG;IACU,0BAAiB,GAAG,kBAAkB,CAAC;IAEpD;;OAEG;IACU,4BAAmB,GAAG,mBAAmB,CAAC;IAEvD;;OAEG;IACU,kCAAyB,GAAG,wBAAwB,CAAC;IAElE;;;OAGG;IACU,sBAAa,GAAG,cAAc,CAAC;IAE5C;;OAEG;IACU,wBAAe,GAAG,gBAAgB,CAAC;AAClD,CAAC,EA7CgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QA6CxB"}

package/dist/service.d.ts

@@ -0,0 +1,63 @@
+import { Binding, BindingFilter, BindingTemplate, Constructor, InjectionMetadata, Provider } from '@loopback/context';
+/**
+ * Representing an interface for services. In TypeScript, the `interface` does
+ * not have reflections at runtime. We use a string, a symbol or a Function as
+ * the type for the service interface.
+ */
+export declare type ServiceInterface = string | symbol | Function;
+/**
+ * Options to register a service binding
+ */
+export declare type ServiceOptions = {
+    name?: string;
+    interface?: ServiceInterface;
+};
+/**
+ * `@service` injects a service instance that matches the class or interface.
+ *
+ * @param serviceInterface - Interface for the service. It can be in one of the
+ * following forms:
+ *
+ * - A class, such as MyService
+ * - A string that identifies the interface, such as `'MyService'`
+ * - A symbol that identifies the interface, such as `Symbol('MyService')`
+ *
+ * If not provided, the value is inferred from the design:type of the parameter
+ * or property
+ *
+ * @example
+ * ```ts
+ *
+ * const ctx = new Context();
+ * ctx.bind('my-service').toClass(MyService);
+ * ctx.bind('logger').toClass(Logger);
+ *
+ * export class MyController {
+ *   constructor(@service(MyService) private myService: MyService) {}
+ *
+ *   @service()
+ *   private logger: Logger;
+ * }
+ *
+ * ctx.bind('my-controller').toClass(MyController);
+ * await myController = ctx.get<MyController>('my-controller');
+ * ```
+ */
+export declare function service(serviceInterface?: ServiceInterface, metadata?: InjectionMetadata): (target: Object, member: string | undefined, methodDescriptorOrParameterIndex?: number | TypedPropertyDescriptor<any> | undefined) => void;
+/**
+ * Create a binding filter by service class
+ * @param serviceInterface - Service class matching the one used by `binding.toClass()`
+ * @param options - Options to control if subclasses should be skipped for matching
+ */
+export declare function filterByServiceInterface(serviceInterface: ServiceInterface): BindingFilter;
+/**
+ * Create a service binding from a class or provider
+ * @param cls - Service class or provider
+ * @param options - Service options
+ */
+export declare function createServiceBinding<S>(cls: Constructor<S> | Constructor<Provider<S>>, options?: ServiceOptions): Binding<S>;
+/**
+ * Create a binding template for a service interface
+ * @param serviceInterface - Service interface
+ */
+export declare function asService(serviceInterface: ServiceInterface): BindingTemplate;

package/dist/service.js

@@ -0,0 +1,128 @@
+"use strict";
+// Copyright IBM Corp. 2019. All Rights Reserved.
+// Node module: @loopback/core
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+Object.defineProperty(exports, "__esModule", { value: true });
+const context_1 = require("@loopback/context");
+const keys_1 = require("./keys");
+/**
+ * `@service` injects a service instance that matches the class or interface.
+ *
+ * @param serviceInterface - Interface for the service. It can be in one of the
+ * following forms:
+ *
+ * - A class, such as MyService
+ * - A string that identifies the interface, such as `'MyService'`
+ * - A symbol that identifies the interface, such as `Symbol('MyService')`
+ *
+ * If not provided, the value is inferred from the design:type of the parameter
+ * or property
+ *
+ * @example
+ * ```ts
+ *
+ * const ctx = new Context();
+ * ctx.bind('my-service').toClass(MyService);
+ * ctx.bind('logger').toClass(Logger);
+ *
+ * export class MyController {
+ *   constructor(@service(MyService) private myService: MyService) {}
+ *
+ *   @service()
+ *   private logger: Logger;
+ * }
+ *
+ * ctx.bind('my-controller').toClass(MyController);
+ * await myController = ctx.get<MyController>('my-controller');
+ * ```
+ */
+function service(serviceInterface, metadata) {
+    return context_1.inject('', Object.assign({ decorator: '@service' }, metadata), (ctx, injection, session) => {
+        let serviceType = serviceInterface;
+        if (!serviceType) {
+            if (typeof injection.methodDescriptorOrParameterIndex === 'number') {
+                serviceType = context_1.MetadataInspector.getDesignTypeForMethod(injection.target, injection.member).parameterTypes[injection.methodDescriptorOrParameterIndex];
+            }
+            else {
+                serviceType = context_1.MetadataInspector.getDesignTypeForProperty(injection.target, injection.member);
+            }
+        }
+        if (serviceType === Object || serviceType === Array) {
+            throw new Error('Service class cannot be inferred from design type. Use @service(ServiceClass).');
+        }
+        const view = new context_1.ContextView(ctx, filterByServiceInterface(serviceType));
+        const result = view.resolve(session);
+        const serviceTypeName = typeof serviceType === 'string'
+            ? serviceType
+            : typeof serviceType === 'symbol'
+                ? serviceType.toString()
+                : serviceType.name;
+        return context_1.transformValueOrPromise(result, values => {
+            var _a;
+            if (values.length === 1)
+                return values[0];
+            if (values.length >= 1) {
+                throw new Error(`More than one bindings found for ${serviceTypeName}`);
+            }
+            else {
+                if ((_a = metadata) === null || _a === void 0 ? void 0 : _a.optional) {
+                    return undefined;
+                }
+                throw new Error(`No binding found for ${serviceTypeName}. Make sure a service ` +
+                    `binding is created in context ${ctx.name} with serviceInterface (${serviceTypeName}).`);
+            }
+        });
+    });
+}
+exports.service = service;
+/**
+ * Create a binding filter by service class
+ * @param serviceInterface - Service class matching the one used by `binding.toClass()`
+ * @param options - Options to control if subclasses should be skipped for matching
+ */
+function filterByServiceInterface(serviceInterface) {
+    return binding => binding.valueConstructor === serviceInterface ||
+        binding.tagMap[keys_1.CoreTags.SERVICE_INTERFACE] === serviceInterface;
+}
+exports.filterByServiceInterface = filterByServiceInterface;
+/**
+ * Create a service binding from a class or provider
+ * @param cls - Service class or provider
+ * @param options - Service options
+ */
+function createServiceBinding(cls, options = {}) {
+    var _a;
+    let name = options.name;
+    if (!name && context_1.isProviderClass(cls)) {
+        // Trim `Provider` from the default service name
+        // This is needed to keep backward compatibility
+        const templateFn = context_1.bindingTemplateFor(cls);
+        const template = context_1.Binding.bind('template').apply(templateFn);
+        if (template.tagMap[context_1.ContextTags.PROVIDER] &&
+            !template.tagMap[context_1.ContextTags.NAME]) {
+            // The class is a provider and no `name` tag is found
+            name = cls.name.replace(/Provider$/, '');
+        }
+    }
+    const binding = context_1.createBindingFromClass(cls, {
+        name,
+        type: keys_1.CoreTags.SERVICE,
+    }).apply(asService((_a = options.interface, (_a !== null && _a !== void 0 ? _a : cls))));
+    return binding;
+}
+exports.createServiceBinding = createServiceBinding;
+/**
+ * Create a binding template for a service interface
+ * @param serviceInterface - Service interface
+ */
+function asService(serviceInterface) {
+    return function serviceTemplate(binding) {
+        binding.tag({
+            [context_1.ContextTags.TYPE]: keys_1.CoreTags.SERVICE,
+            [keys_1.CoreTags.SERVICE_INTERFACE]: serviceInterface,
+        });
+    };
+}
+exports.asService = asService;
+//# sourceMappingURL=service.js.map

package/dist/service.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loopback/core",
-  "version": "1.10.6",
+  "version": "1.12.1",
   "description": "LoopBack 4 core",
   "engines": {
     "node": ">=8.9"
@@ -19,15 +19,16 @@
   "copyright.owner": "IBM Corp.",
   "license": "MIT",
   "dependencies": {
-    "@loopback/context": "^1.23.4",
-    "debug": "^4.1.1"
+    "@loopback/context": "^1.25.1",
+    "debug": "^4.1.1",
+    "p-event": "^4.1.0"
   },
   "devDependencies": {
-    "@loopback/build": "^2.0.15",
-    "@loopback/eslint-config": "^4.1.3",
-    "@loopback/testlab": "^1.9.3",
+    "@loopback/build": "^3.0.1",
+    "@loopback/eslint-config": "^5.0.1",
+    "@loopback/testlab": "^1.10.1",
     "@types/debug": "^4.1.5",
-    "@types/node": "^10.17.0"
+    "@types/node": "^10.17.13"
   },
   "files": [
     "README.md",
@@ -42,5 +43,5 @@
     "url": "https://github.com/strongloop/loopback-next.git",
     "directory": "packages/core"
   },
-  "gitHead": "d7c3cb9d7bd3215bfc6e6ed996416bbb8e3163d3"
+  "gitHead": "598baf6e84de3917bb67aff47a1ab1cb1111e3d2"
 }

package/src/application.ts

@@ -6,15 +6,14 @@
 import {
   Binding,
   BindingScope,
-  bindingTemplateFor,
   Constructor,
   Context,
-  ContextTags,
   createBindingFromClass,
-  isProviderClass,
   Provider,
 } from '@loopback/context';
-import * as debugFactory from 'debug';
+import assert from 'assert';
+import pEvent from 'p-event';
+import debugFactory from 'debug';
 import {Component, mountComponent} from './component';
 import {CoreBindings, CoreTags} from './keys';
 import {
@@ -24,6 +23,7 @@ import {
 } from './lifecycle';
 import {LifeCycleObserverRegistry} from './lifecycle-registry';
 import {Server} from './server';
+import {createServiceBinding, ServiceOptions} from './service';
 const debug = debugFactory('loopback:core:application');
 
 /**
@@ -34,6 +34,39 @@ const debug = debugFactory('loopback:core:application');
 export class Application extends Context implements LifeCycleObserver {
   public readonly options: ApplicationConfig;
 
+  /**
+   * A flag to indicate that the application is being shut down
+   */
+  private _isShuttingDown = false;
+
+  /**
+   * State of the application
+   */
+  private _state = 'created';
+
+  /**
+   * Get the state of the application. The initial state is `created` and it can
+   * transition as follows by `start` and `stop`:
+   *
+   * 1. start
+   *   - !started -> starting -> started
+   *   - started -> started (no-op)
+   * 2. stop
+   *   - started -> stopping -> stopped
+   *   - !started -> stopped (no-op)
+   *
+   * Two types of states are expected:
+   * - stable, such as `started` and `stopped`
+   * - in process, such as `booting` and `starting`
+   *
+   * Operations such as `start` and `stop` can only be called at a stable state.
+   * The logic should immediately set the state to a new one indicating work in
+   * process, such as `starting` and `stopping`.
+   */
+  public get state() {
+    return this._state;
+  }
+
   /**
    * Create an application with the given parent context
    * @param parent - Parent context
@@ -53,7 +86,7 @@ export class Application extends Context implements LifeCycleObserver {
     );
 
     if (configOrParent instanceof Context) configOrParent = {};
-    this.options = configOrParent || {};
+    this.options = configOrParent ?? {};
 
     // Bind the life cycle observer registry
     this.bind(CoreBindings.LIFE_CYCLE_OBSERVER_REGISTRY)
@@ -63,6 +96,12 @@ export class Application extends Context implements LifeCycleObserver {
     this.bind(CoreBindings.APPLICATION_INSTANCE).to(this);
     // Make options available to other modules as well.
     this.bind(CoreBindings.APPLICATION_CONFIG).to(this.options);
+
+    const shutdownConfig = this.options.shutdown ?? {};
+    this.setupShutdown(
+      shutdownConfig.signals ?? ['SIGTERM'],
+      shutdownConfig.gracePeriod,
+    );
   }
 
   /**
@@ -83,7 +122,7 @@ export class Application extends Context implements LifeCycleObserver {
    * ```
    */
   controller(controllerCtor: ControllerClass, name?: string): Binding {
-    debug('Adding controller %s', name || controllerCtor.name);
+    debug('Adding controller %s', name ?? controllerCtor.name);
     const binding = createBindingFromClass(controllerCtor, {
       name,
       namespace: CoreBindings.CONTROLLERS,
@@ -116,7 +155,7 @@ export class Application extends Context implements LifeCycleObserver {
     ctor: Constructor<T>,
     name?: string,
   ): Binding<T> {
-    debug('Adding server %s', name || ctor.name);
+    debug('Adding server %s', name ?? ctor.name);
     const binding = createBindingFromClass(ctor, {
       name,
       namespace: CoreBindings.SERVERS,
@@ -177,19 +216,80 @@ export class Application extends Context implements LifeCycleObserver {
   }
 
   /**
-   * Start the application, and all of its registered observers.
+   * Assert there is no other operation is in progress, i.e., the state is not
+   * `*ing`, such as `starting` or `stopping`.
+   *
+   * @param op - The operation name, such as 'boot', 'start', or 'stop'
+   */
+  protected assertNotInProcess(op: string) {
+    assert(
+      !this._state.endsWith('ing'),
+      `Cannot ${op} the application as it is ${this._state}.`,
+    );
+  }
+
+  /**
+   * Assert current state of the application to be one of the expected values
+   * @param op - The operation name, such as 'boot', 'start', or 'stop'
+   * @param states - Valid states
+   */
+  protected assertInStates(op: string, ...states: string[]) {
+    assert(
+      states.includes(this._state),
+      `Cannot ${op} the application as it is ${this._state}. Valid states are ${states}.`,
+    );
+  }
+
+  /**
+   * Transition the application to a new state and emit an event
+   * @param state - The new state
+   */
+  protected setState(state: string) {
+    const oldState = this._state;
+    this._state = state;
+    if (oldState !== state) {
+      this.emit('stateChanged', {from: oldState, to: this._state});
+      this.emit(state);
+    }
+  }
+
+  protected async awaitState(state: string) {
+    await pEvent(this, state);
+  }
+
+  /**
+   * Start the application, and all of its registered observers. The application
+   * state is checked to ensure the integrity of `start`.
+   *
+   * If the application is already started, no operation is performed.
    */
   public async start(): Promise<void> {
+    if (this._state === 'starting') return this.awaitState('started');
+    this.assertNotInProcess('start');
+    // No-op if it's started
+    if (this._state === 'started') return;
+    this.setState('starting');
     const registry = await this.getLifeCycleObserverRegistry();
     await registry.start();
+    this.setState('started');
   }
 
   /**
-   * Stop the application instance and all of its registered observers.
+   * Stop the application instance and all of its registered observers. The
+   * application state is checked to ensure the integrity of `stop`.
+   *
+   * If the application is already stopped or not started, no operation is
+   * performed.
    */
   public async stop(): Promise<void> {
+    if (this._state === 'stopping') return this.awaitState('stopped');
+    this.assertNotInProcess('stop');
+    // No-op if it's created or stopped
+    if (this._state !== 'started') return;
+    this.setState('stopping');
     const registry = await this.getLifeCycleObserverRegistry();
     await registry.stop();
+    this.setState('stopped');
   }
 
   private async getLifeCycleObserverRegistry() {
@@ -219,7 +319,7 @@ export class Application extends Context implements LifeCycleObserver {
    * ```
    */
   public component(componentCtor: Constructor<Component>, name?: string) {
-    debug('Adding component: %s', name || componentCtor.name);
+    debug('Adding component: %s', name ?? componentCtor.name);
     const binding = createBindingFromClass(componentCtor, {
       name,
       namespace: CoreBindings.COMPONENTS,
@@ -255,7 +355,7 @@ export class Application extends Context implements LifeCycleObserver {
     ctor: Constructor<T>,
     name?: string,
   ): Binding<T> {
-    debug('Adding life cycle observer %s', name || ctor.name);
+    debug('Adding life cycle observer %s', name ?? ctor.name);
     const binding = createBindingFromClass(ctor, {
       name,
       namespace: CoreBindings.LIFE_CYCLE_OBSERVERS,
@@ -310,34 +410,70 @@ export class Application extends Context implements LifeCycleObserver {
    */
   public service<S>(
     cls: Constructor<S> | Constructor<Provider<S>>,
-    name?: string,
+    name?: string | ServiceOptions,
   ): Binding<S> {
-    if (!name && isProviderClass(cls)) {
-      // Trim `Provider` from the default service name
-      // This is needed to keep backward compatibility
-      const templateFn = bindingTemplateFor(cls);
-      const template = Binding.bind<S>('template').apply(templateFn);
-      if (
-        template.tagMap[ContextTags.PROVIDER] &&
-        !template.tagMap[ContextTags.NAME]
-      ) {
-        // The class is a provider and no `name` tag is found
-        name = cls.name.replace(/Provider$/, '');
-      }
-    }
-    const binding = createBindingFromClass(cls, {
-      name,
-      type: 'service',
-    });
+    const options = typeof name === 'string' ? {name} : name;
+    const binding = createServiceBinding(cls, options);
     this.add(binding);
     return binding;
   }
+
+  /**
+   * Set up signals that are captured to shutdown the application
+   * @param signals - An array of signals to be trapped
+   * @param gracePeriod - A grace period in ms before forced exit
+   */
+  protected setupShutdown(signals: NodeJS.Signals[], gracePeriod?: number) {
+    const cleanup = async (signal: string) => {
+      const kill = () => {
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        signals.forEach(sig => process.removeListener(sig, cleanup));
+        process.kill(process.pid, signal);
+      };
+      debug('Signal %s received for process %d', signal, process.pid);
+      if (!this._isShuttingDown) {
+        this._isShuttingDown = true;
+        let timer;
+        if (typeof gracePeriod === 'number' && !isNaN(gracePeriod)) {
+          timer = setTimeout(kill, gracePeriod);
+        }
+        try {
+          await this.stop();
+        } finally {
+          if (timer != null) clearTimeout(timer);
+          kill();
+        }
+      }
+    };
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    signals.forEach(sig => process.on(sig, cleanup));
+  }
 }
 
+/**
+ * Options to set up application shutdown
+ */
+export type ShutdownOptions = {
+  /**
+   * An array of signals to be trapped for graceful shutdown
+   */
+  signals?: NodeJS.Signals[];
+  /**
+   * Period in milliseconds to wait for the grace shutdown to finish before
+   * exiting the process
+   */
+  gracePeriod?: number;
+};
+
 /**
  * Configuration for application
  */
 export interface ApplicationConfig {
+  /**
+   * Configuration for signals that shut down the application
+   */
+  shutdown?: ShutdownOptions;
+
   /**
    * Other properties
    */

package/src/extension-point.ts

@@ -67,7 +67,7 @@ export function extensionPoint(name: string, ...specs: BindingSpec[]) {
 export function extensions(extensionPointName?: string) {
   return inject('', {decorator: '@extensions'}, (ctx, injection, session) => {
     extensionPointName =
-      extensionPointName ||
+      extensionPointName ??
       inferExtensionPointName(injection.target, session.currentBinding);
 
     const bindingFilter = extensionFilter(extensionPointName);

package/src/index.ts

@@ -14,3 +14,4 @@ export * from './keys';
 export * from './lifecycle';
 export * from './lifecycle-registry';
 export * from './server';
+export * from './service';

package/src/keys.ts

@@ -120,6 +120,10 @@ export namespace CoreTags {
    * Binding tag for services
    */
   export const SERVICE = 'service';
+  /**
+   * Binding tag for the service interface
+   */
+  export const SERVICE_INTERFACE = 'serviceInterface';
 
   /**
    * Binding tag for life cycle observers

package/src/service.ts

@@ -0,0 +1,180 @@
+// Copyright IBM Corp. 2019. All Rights Reserved.
+// Node module: @loopback/core
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+import {
+  Binding,
+  BindingFilter,
+  BindingTemplate,
+  bindingTemplateFor,
+  Constructor,
+  ContextTags,
+  ContextView,
+  createBindingFromClass,
+  inject,
+  InjectionMetadata,
+  isProviderClass,
+  MetadataInspector,
+  Provider,
+  transformValueOrPromise,
+} from '@loopback/context';
+import {CoreTags} from './keys';
+
+/**
+ * Representing an interface for services. In TypeScript, the `interface` does
+ * not have reflections at runtime. We use a string, a symbol or a Function as
+ * the type for the service interface.
+ */
+export type ServiceInterface = string | symbol | Function;
+
+/**
+ * Options to register a service binding
+ */
+export type ServiceOptions = {
+  name?: string;
+  interface?: ServiceInterface;
+};
+
+/**
+ * `@service` injects a service instance that matches the class or interface.
+ *
+ * @param serviceInterface - Interface for the service. It can be in one of the
+ * following forms:
+ *
+ * - A class, such as MyService
+ * - A string that identifies the interface, such as `'MyService'`
+ * - A symbol that identifies the interface, such as `Symbol('MyService')`
+ *
+ * If not provided, the value is inferred from the design:type of the parameter
+ * or property
+ *
+ * @example
+ * ```ts
+ *
+ * const ctx = new Context();
+ * ctx.bind('my-service').toClass(MyService);
+ * ctx.bind('logger').toClass(Logger);
+ *
+ * export class MyController {
+ *   constructor(@service(MyService) private myService: MyService) {}
+ *
+ *   @service()
+ *   private logger: Logger;
+ * }
+ *
+ * ctx.bind('my-controller').toClass(MyController);
+ * await myController = ctx.get<MyController>('my-controller');
+ * ```
+ */
+export function service(
+  serviceInterface?: ServiceInterface,
+  metadata?: InjectionMetadata,
+) {
+  return inject(
+    '',
+    {decorator: '@service', ...metadata},
+    (ctx, injection, session) => {
+      let serviceType = serviceInterface;
+      if (!serviceType) {
+        if (typeof injection.methodDescriptorOrParameterIndex === 'number') {
+          serviceType = MetadataInspector.getDesignTypeForMethod(
+            injection.target,
+            injection.member!,
+          ).parameterTypes[injection.methodDescriptorOrParameterIndex];
+        } else {
+          serviceType = MetadataInspector.getDesignTypeForProperty(
+            injection.target,
+            injection.member!,
+          );
+        }
+      }
+      if (serviceType === Object || serviceType === Array) {
+        throw new Error(
+          'Service class cannot be inferred from design type. Use @service(ServiceClass).',
+        );
+      }
+      const view = new ContextView(ctx, filterByServiceInterface(serviceType));
+      const result = view.resolve(session);
+
+      const serviceTypeName =
+        typeof serviceType === 'string'
+          ? serviceType
+          : typeof serviceType === 'symbol'
+          ? serviceType.toString()
+          : serviceType.name;
+      return transformValueOrPromise(result, values => {
+        if (values.length === 1) return values[0];
+        if (values.length >= 1) {
+          throw new Error(
+            `More than one bindings found for ${serviceTypeName}`,
+          );
+        } else {
+          if (metadata?.optional) {
+            return undefined;
+          }
+          throw new Error(
+            `No binding found for ${serviceTypeName}. Make sure a service ` +
+              `binding is created in context ${ctx.name} with serviceInterface (${serviceTypeName}).`,
+          );
+        }
+      });
+    },
+  );
+}
+
+/**
+ * Create a binding filter by service class
+ * @param serviceInterface - Service class matching the one used by `binding.toClass()`
+ * @param options - Options to control if subclasses should be skipped for matching
+ */
+export function filterByServiceInterface(
+  serviceInterface: ServiceInterface,
+): BindingFilter {
+  return binding =>
+    binding.valueConstructor === serviceInterface ||
+    binding.tagMap[CoreTags.SERVICE_INTERFACE] === serviceInterface;
+}
+
+/**
+ * Create a service binding from a class or provider
+ * @param cls - Service class or provider
+ * @param options - Service options
+ */
+export function createServiceBinding<S>(
+  cls: Constructor<S> | Constructor<Provider<S>>,
+  options: ServiceOptions = {},
+): Binding<S> {
+  let name = options.name;
+  if (!name && isProviderClass(cls)) {
+    // Trim `Provider` from the default service name
+    // This is needed to keep backward compatibility
+    const templateFn = bindingTemplateFor(cls);
+    const template = Binding.bind<S>('template').apply(templateFn);
+    if (
+      template.tagMap[ContextTags.PROVIDER] &&
+      !template.tagMap[ContextTags.NAME]
+    ) {
+      // The class is a provider and no `name` tag is found
+      name = cls.name.replace(/Provider$/, '');
+    }
+  }
+  const binding = createBindingFromClass(cls, {
+    name,
+    type: CoreTags.SERVICE,
+  }).apply(asService(options.interface ?? cls));
+  return binding;
+}
+
+/**
+ * Create a binding template for a service interface
+ * @param serviceInterface - Service interface
+ */
+export function asService(serviceInterface: ServiceInterface): BindingTemplate {
+  return function serviceTemplate(binding: Binding) {
+    binding.tag({
+      [ContextTags.TYPE]: CoreTags.SERVICE,
+      [CoreTags.SERVICE_INTERFACE]: serviceInterface,
+    });
+  };
+}