@strapi/core 0.0.0-experimental.6dbac0c205b0f8495781db5706c18cac1a62e62b → 0.0.0-experimental.7273fc63f5c2c8aa9e100655b1776f3e0621e61a

package/dist/Strapi.js

@@ -1,153 +1,139 @@
 "use strict";
+const globalAgent = require("global-agent");
 const path = require("path");
 const _ = require("lodash");
-const _$1 = require("lodash/fp");
+const fp = require("lodash/fp");
 const logger = require("@strapi/logger");
 const database = require("@strapi/database");
-const strapiUtils = require("@strapi/utils");
-const index = require("./core/app-configuration/index.js");
+const index = require("./configuration/index.js");
 const factories = require("./factories.js");
-const compile = require("./compile.js");
 const openBrowser = require("./utils/open-browser.js");
 const isInitialized = require("./utils/is-initialized.js");
-const getDirs = require("./utils/get-dirs.js");
-const contentTypes = require("./core/registries/content-types.js");
-const components = require("./core/registries/components.js");
-const services = require("./core/registries/services.js");
-const policies = require("./core/registries/policies.js");
-const middlewares = require("./core/registries/middlewares.js");
-const hooks = require("./core/registries/hooks.js");
-const controllers = require("./core/registries/controllers.js");
-const modules = require("./core/registries/modules.js");
-const plugins = require("./core/registries/plugins.js");
-const customFields = require("./core/registries/custom-fields.js");
-const config = require("./core/registries/config.js");
-const apis = require("./core/registries/apis.js");
-const sanitizers = require("./core/registries/sanitizers.js");
-const validators = require("./core/registries/validators.js");
-const index$7 = require("./core/loaders/index.js");
+const index$2 = require("./ee/index.js");
+require("./utils/update-notifier/index.js");
+const fetch = require("./utils/fetch.js");
+const convertCustomFieldType = require("./utils/convert-custom-field-type.js");
+const startupLogger = require("./utils/startup-logger.js");
+const transformContentTypesToModels = require("./utils/transform-content-types-to-models.js");
+const lifecycles = require("./utils/lifecycles.js");
+require("node:path");
 const container = require("./container.js");
 const fs = require("./services/fs.js");
 const eventHub = require("./services/event-hub.js");
-const index$3 = require("./services/server/index.js");
-const webhookRunner = require("./services/webhook-runner.js");
-const webhookStore = require("./services/webhook-store.js");
-const coreStore = require("./services/core-store.js");
-const index$9 = require("./services/entity-service/index.js");
-const cron = require("./services/cron.js");
-const index$8 = require("./services/entity-validator/index.js");
-const index$4 = require("./services/metrics/index.js");
+const index$5 = require("./services/server/index.js");
+const reloader = require("./services/reloader.js");
+const index$1 = require("./providers/index.js");
+const index$7 = require("./services/entity-service/index.js");
+const queryParams = require("./services/query-params.js");
+const index$6 = require("./services/entity-validator/index.js");
 const requestContext = require("./services/request-context.js");
-const index$2 = require("./services/auth/index.js");
-const customFields$1 = require("./services/custom-fields.js");
-const index$1 = require("./services/content-api/index.js");
-const index$5 = require("./utils/update-notifier/index.js");
-const startupLogger = require("./utils/startup-logger.js");
-const fetch = require("./utils/fetch.js");
-const lifecycles = require("./utils/lifecycles.js");
-const index$6 = require("./ee/index.js");
-const bootstrap = require("./core/bootstrap.js");
-const signals = require("./utils/signals.js");
+const index$4 = require("./services/auth/index.js");
+const customFields = require("./services/custom-fields.js");
+const index$3 = require("./services/content-api/index.js");
 const dynamicZones = require("./services/utils/dynamic-zones.js");
-const convertCustomFieldType = require("./utils/convert-custom-field-type.js");
-const transformContentTypesToModels = require("./utils/transform-content-types-to-models.js");
-const documentRepository = require("./services/document-service/document-repository.js");
+const features = require("./services/features.js");
+const index$8 = require("./services/document-service/index.js");
+const coreStore = require("./services/core-store.js");
+const config = require("./services/config.js");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const path__default = /* @__PURE__ */ _interopDefault(path);
-const ___default = /* @__PURE__ */ _interopDefault(_);
-const resolveWorkingDirectories = (opts) => {
-  const cwd = process.cwd();
-  const appDir = opts.appDir ? path__default.default.resolve(cwd, opts.appDir) : cwd;
-  const distDir = opts.distDir ? path__default.default.resolve(cwd, opts.distDir) : appDir;
-  return { app: appDir, dist: distDir };
-};
-const reloader = (strapi) => {
-  const state = {
-    shouldReload: 0,
-    isWatching: true
-  };
-  function reload() {
-    if (state.shouldReload > 0) {
-      state.shouldReload -= 1;
-      reload.isReloading = false;
-      return;
-    }
-    if (strapi.config.get("autoReload")) {
-      process.send?.("reload");
-    }
-  }
-  Object.defineProperty(reload, "isWatching", {
-    configurable: true,
-    enumerable: true,
-    set(value) {
-      if (state.isWatching === false && value === true) {
-        state.shouldReload += 1;
+function _interopNamespace(e) {
+  if (e && e.__esModule)
+    return e;
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
       }
-      state.isWatching = value;
-    },
-    get() {
-      return state.isWatching;
     }
-  });
-  reload.isReloading = false;
-  reload.isWatching = true;
-  return reload;
-};
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const globalAgent__namespace = /* @__PURE__ */ _interopNamespace(globalAgent);
+const path__default = /* @__PURE__ */ _interopDefault(path);
+const ___default = /* @__PURE__ */ _interopDefault(_);
 class Strapi extends container.Container {
-  server;
-  log;
-  fs;
-  eventHub;
-  startupLogger;
-  cron;
-  webhookRunner;
-  webhookStore;
-  store;
-  entityValidator;
-  entityService;
-  documents;
-  telemetry;
-  requestContext;
-  customFields;
-  fetch;
-  dirs;
-  admin;
-  isLoaded;
-  db;
   app;
-  EE;
-  reload;
-  constructor(opts = {}) {
+  isLoaded = false;
+  internal_config = {};
+  constructor(opts) {
     super();
-    signals.destroyOnSignal(this);
-    const rootDirs = resolveWorkingDirectories(opts);
-    const appConfig = index(rootDirs, opts);
-    this.add("config", config(appConfig)).add("content-types", contentTypes()).add("components", components()).add("services", services(this)).add("policies", policies()).add("middlewares", middlewares()).add("hooks", hooks()).add("controllers", controllers(this)).add("modules", modules(this)).add("plugins", plugins(this)).add("custom-fields", customFields(this)).add("apis", apis(this)).add("sanitizers", sanitizers()).add("validators", validators()).add("content-api", index$1(this)).add("auth", index$2());
-    this.dirs = getDirs(rootDirs, { strapi: this });
-    this.isLoaded = false;
-    this.reload = reloader(this);
-    this.server = index$3.createServer(this);
-    this.fs = fs(this);
-    this.eventHub = eventHub();
-    this.startupLogger = startupLogger(this);
-    this.log = logger.createLogger(this.config.get("logger", { level: "info" }));
-    this.cron = cron();
-    this.telemetry = index$4(this);
-    this.requestContext = requestContext;
-    this.customFields = customFields$1(this);
-    this.fetch = fetch.createStrapiFetch(this);
-    index$5(this).notify();
-    Object.defineProperty(this, "EE", {
-      get: () => {
-        index$6.init(this.dirs.app.root, this.log);
-        return index$6.isEE;
-      },
-      configurable: false
-    });
-    Object.defineProperty(this, "ee", {
-      get: () => index$6,
-      configurable: false
-    });
+    this.internal_config = index.loadConfiguration(opts);
+    this.registerInternalServices();
+    for (const provider of index$1.providers) {
+      provider.init?.(this);
+    }
+  }
+  get admin() {
+    return this.get("admin");
+  }
+  get EE() {
+    return index$2.isEE;
+  }
+  get ee() {
+    return index$2;
+  }
+  get dirs() {
+    return this.config.get("dirs");
+  }
+  get reload() {
+    return this.get("reload");
+  }
+  get db() {
+    return this.get("db");
+  }
+  get requestContext() {
+    return this.get("requestContext");
+  }
+  get customFields() {
+    return this.get("customFields");
+  }
+  get entityValidator() {
+    return this.get("entityValidator");
+  }
+  /**
+   * @deprecated `strapi.entityService` will be removed in the next major version
+   */
+  get entityService() {
+    return this.get("entityService");
+  }
+  get documents() {
+    return this.get("documents");
+  }
+  get features() {
+    return this.get("features");
+  }
+  get fetch() {
+    return this.get("fetch");
+  }
+  get cron() {
+    return this.get("cron");
+  }
+  get log() {
+    return this.get("logger");
+  }
+  get startupLogger() {
+    return this.get("startupLogger");
+  }
+  get eventHub() {
+    return this.get("eventHub");
+  }
+  get fs() {
+    return this.get("fs");
+  }
+  get server() {
+    return this.get("server");
+  }
+  get telemetry() {
+    return this.get("telemetry");
+  }
+  get store() {
+    return this.get("coreStore");
   }
   get config() {
     return this.get("config");
@@ -197,12 +183,12 @@ class Strapi extends container.Container {
   hook(name) {
     return this.get("hooks").get(name);
   }
-  // api(name) {
-  //   return this.get('apis').get(name);
-  // }
-  get api() {
+  get apis() {
     return this.get("apis").getAll();
   }
+  api(name) {
+    return this.get("apis").get(name);
+  }
   get auth() {
     return this.get("auth");
   }
@@ -226,15 +212,29 @@ class Strapi extends container.Container {
       return this.stopWithError(error);
     }
   }
-  async destroy() {
-    await this.server.destroy();
-    await this.runLifecyclesFunctions(lifecycles.LIFECYCLES.DESTROY);
-    this.eventHub.destroy();
-    await this.db?.destroy();
-    this.telemetry.destroy();
-    this.cron.destroy();
-    process.removeAllListeners();
-    delete global.strapi;
+  // TODO: split into more providers
+  registerInternalServices() {
+    const config$1 = config.createConfigProvider(this.internal_config, this);
+    const logger$1 = logger.createLogger({
+      level: "http",
+      // Strapi defaults to level 'http'
+      ...config$1.get("logger"),
+      // DEPRECATED
+      ...config$1.get("server.logger.config")
+    });
+    this.add("config", () => config$1).add("query-params", queryParams(this)).add("content-api", index$3(this)).add("auth", index$4()).add("server", () => index$5.createServer(this)).add("fs", () => fs(this)).add("eventHub", () => eventHub()).add("startupLogger", () => startupLogger.createStartupLogger(this)).add("logger", () => logger$1).add("fetch", () => fetch.createStrapiFetch(this)).add("features", () => features.createFeaturesService(this)).add("requestContext", requestContext).add("customFields", customFields(this)).add("entityValidator", index$6).add("entityService", () => index$7({ strapi: this, db: this.db })).add("documents", () => index$8.createDocumentService(this)).add(
+      "db",
+      () => new database.Database(
+        ___default.default.merge(this.config.get("database"), {
+          logger: logger$1,
+          settings: {
+            migrations: {
+              dir: path__default.default.join(this.dirs.app.root, "database/migrations")
+            }
+          }
+        })
+      )
+    ).add("reload", () => reloader.createReloader(this));
   }
   sendStartupTelemetry() {
     this.telemetry.send("didStartServer", {
@@ -245,17 +245,21 @@ class Strapi extends container.Container {
         // TODO: V5: This event should be renamed numberOfContentTypes in V5 as the name is already taken to describe the number of content types using i18n.
         numberOfComponents: ___default.default.size(this.components),
         numberOfDynamicZones: dynamicZones(),
+        numberOfCustomControllers: Object.values(this.controllers).filter(
+          // TODO: Fix this at the content API loader level to prevent future types issues
+          (controller) => controller !== void 0 && factories.isCustomController(controller)
+        ).length,
         environment: this.config.environment
         // TODO: to add back
         // providers: this.config.installedProviders,
       }
-    });
+    }).catch(this.log.error);
   }
   async openAdmin({ isInitialized: isInitialized2 }) {
     const shouldOpenAdmin = this.config.get("environment") === "development" && this.config.get("admin.autoOpen", true) !== false;
     if (shouldOpenAdmin && !isInitialized2) {
       try {
-        await openBrowser(this.config);
+        await openBrowser.openBrowser(this.config);
         this.telemetry.send("didOpenTab");
       } catch (e) {
         this.telemetry.send("didNotOpenTab");
@@ -263,8 +267,9 @@ class Strapi extends container.Container {
     }
   }
   async postListen() {
-    const isInitialized$1 = await isInitialized(this);
+    const isInitialized$1 = await isInitialized.isInitialized(this);
     this.startupLogger.logStartupMessage({ isInitialized: isInitialized$1 });
+    this.log.info("Strapi started successfully");
     this.sendStartupTelemetry();
     this.openAdmin({ isInitialized: isInitialized$1 });
   }
@@ -305,53 +310,34 @@ class Strapi extends container.Container {
     }
     process.exit(exitCode);
   }
-  registerInternalHooks() {
-    this.get("hooks").set("strapi::content-types.beforeSync", strapiUtils.hooks.createAsyncParallelHook());
-    this.get("hooks").set("strapi::content-types.afterSync", strapiUtils.hooks.createAsyncParallelHook());
+  async load() {
+    await this.register();
+    await this.bootstrap();
+    this.isLoaded = true;
+    return this;
   }
   async register() {
-    await index$7.loadApplicationContext(this);
-    await bootstrap({ strapi: this });
-    this.webhookRunner = webhookRunner({
-      eventHub: this.eventHub,
-      logger: this.log,
-      configuration: this.config.get("server.webhooks", {}),
-      fetch: this.fetch
-    });
-    this.registerInternalHooks();
-    this.telemetry.register();
-    await this.runLifecyclesFunctions(lifecycles.LIFECYCLES.REGISTER);
-    convertCustomFieldType(this);
+    this.ee.init(this.dirs.app.root, this.log);
+    for (const provider of index$1.providers) {
+      await provider.register?.(this);
+    }
+    await this.runPluginsLifecycles(lifecycles.LIFECYCLES.REGISTER);
+    await this.runUserLifecycles(lifecycles.LIFECYCLES.REGISTER);
+    convertCustomFieldType.convertCustomFieldType(this);
     return this;
   }
   async bootstrap() {
-    const contentTypes2 = [
-      coreStore.coreStoreModel,
-      webhookStore.webhookModel,
-      ...Object.values(this.contentTypes),
-      ...Object.values(this.components)
+    this.configureGlobalProxy();
+    const models = [
+      ...transformContentTypesToModels.transformContentTypesToModels(
+        [...Object.values(this.contentTypes), ...Object.values(this.components)],
+        this.db.metadata.identifiers
+      ),
+      ...this.get("models").get()
     ];
-    this.db = await database.Database.init({
-      ...this.config.get("database"),
-      models: transformContentTypesToModels.transformContentTypesToModels(contentTypes2)
-    });
-    this.store = coreStore.createCoreStore({ db: this.db });
-    this.webhookStore = webhookStore.createWebhookStore({ db: this.db });
-    this.entityValidator = index$8;
-    this.entityService = index$9({
-      strapi: this,
-      db: this.db,
-      eventHub: this.eventHub,
-      entityValidator: this.entityValidator
-    });
-    this.documents = documentRepository.createDocumentRepository(this);
-    if (this.config.get("server.cron.enabled", true)) {
-      const cronTasks = this.config.get("server.cron.tasks", {});
-      this.cron.add(cronTasks);
-    }
-    this.telemetry.bootstrap();
+    await this.db.init({ models });
     let oldContentTypes;
-    if (await this.db.getSchemaConnection().hasTable(coreStore.coreStoreModel.collectionName)) {
+    if (await this.db.getSchemaConnection().hasTable(coreStore.coreStoreModel.tableName)) {
       oldContentTypes = await this.store.get({
         type: "strapi",
         name: "content_types",
@@ -364,7 +350,7 @@ class Strapi extends container.Container {
     });
     await this.db.schema.sync();
     if (this.EE) {
-      await index$6.checkLicense({ strapi: this });
+      await index$2.checkLicense({ strapi: this });
     }
     await this.hook("strapi::content-types.afterSync").call({
       oldContentTypes,
@@ -376,37 +362,53 @@ class Strapi extends container.Container {
       key: "schema",
       value: this.contentTypes
     });
-    await this.startWebhooks();
     await this.server.initMiddlewares();
     this.server.initRouting();
     await this.contentAPI.permissions.registerActions();
-    await this.runLifecyclesFunctions(lifecycles.LIFECYCLES.BOOTSTRAP);
-    this.cron.start();
-    return this;
-  }
-  async load() {
-    await this.register();
-    await this.bootstrap();
-    this.isLoaded = true;
+    await this.runPluginsLifecycles(lifecycles.LIFECYCLES.BOOTSTRAP);
+    for (const provider of index$1.providers) {
+      await provider.bootstrap?.(this);
+    }
+    await this.runUserLifecycles(lifecycles.LIFECYCLES.BOOTSTRAP);
     return this;
   }
-  async startWebhooks() {
-    const webhooks = await this.webhookStore?.findWebhooks();
-    if (!webhooks) {
+  configureGlobalProxy() {
+    const globalProxy = this.config.get("server.proxy.global");
+    const httpProxy = this.config.get("server.proxy.http") || globalProxy;
+    const httpsProxy = this.config.get("server.proxy.https") || globalProxy;
+    if (!httpProxy && !httpsProxy) {
       return;
     }
-    for (const webhook of webhooks) {
-      this.webhookRunner?.add(webhook);
+    globalAgent__namespace.bootstrap();
+    if (httpProxy) {
+      this.log.info(`Using HTTP proxy: ${httpProxy}`);
+      global.GLOBAL_AGENT.HTTP_PROXY = httpProxy;
+    }
+    if (httpsProxy) {
+      this.log.info(`Using HTTPS proxy: ${httpsProxy}`);
+      global.GLOBAL_AGENT.HTTPS_PROXY = httpsProxy;
     }
   }
-  async runLifecyclesFunctions(lifecycleName) {
-    await this.get("modules")[lifecycleName]();
-    const adminLifecycleFunction = this.admin && this.admin[lifecycleName];
-    if (_$1.isFunction(adminLifecycleFunction)) {
-      await adminLifecycleFunction({ strapi: this });
+  async destroy() {
+    this.log.info("Shutting down Strapi");
+    await this.runPluginsLifecycles(lifecycles.LIFECYCLES.DESTROY);
+    for (const provider of index$1.providers) {
+      await provider.destroy?.(this);
     }
+    await this.runUserLifecycles(lifecycles.LIFECYCLES.DESTROY);
+    await this.server.destroy();
+    this.eventHub.destroy();
+    await this.db?.destroy();
+    process.removeAllListeners();
+    delete global.strapi;
+    this.log.info("Strapi has been shut down");
+  }
+  async runPluginsLifecycles(lifecycleName) {
+    await this.get("modules")[lifecycleName]();
+  }
+  async runUserLifecycles(lifecycleName) {
     const userLifecycleFunction = this.app && this.app[lifecycleName];
-    if (_$1.isFunction(userLifecycleFunction)) {
+    if (fp.isFunction(userLifecycleFunction)) {
       await userLifecycleFunction({ strapi: this });
     }
   }
@@ -419,18 +421,11 @@ class Strapi extends container.Container {
     }
   }
   /**
-   * Binds queries with a specific model
-   * @param {string} uid
+   * @deprecated Use `strapi.db.query` instead
    */
   query(uid) {
     return this.db.query(uid);
   }
 }
-const initFn = (options = {}) => {
-  const strapi = new Strapi(options);
-  global.strapi = strapi;
-  return strapi;
-};
-const init = Object.assign(initFn, { factories, compile });
-module.exports = init;
+module.exports = Strapi;
 //# sourceMappingURL=Strapi.js.map