@ms-cloudpack/app-server 0.1.33-beta.0 → 0.2.0

package/lib/startAppServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAG3E,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAA8B,EAC9B,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACb,cAAc,EACd,MAAM,GACP,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,SAAS,CAAC,CAmDrB"}
+{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAG3E,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAA8B,EAC9B,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACb,cAAc,EACd,MAAM,GACP,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,SAAS,CAAC,CAoDrB"}

package/lib/startAppServer.js

@@ -24,6 +24,7 @@ export async function startAppServer({ session, bundleServer, apiServer, definit
             portRange: ports,
             requireSpecifiedPort,
             hostname: devServer?.domain,
+            requestHeaders: devServer?.requestHeaders,
             sslOptions: config.devServer?.https,
             //  publicDir,
             middlewareMode,

package/lib/startAppServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAQtE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,EAC9B,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACb,cAAc,EACd,MAAM,GAaP;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,4BAA4B,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;IAE9E,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YACvD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,cAAc;YACd,MAAM;SACP,CAAC,CAAC;QAEH,YAAY,CAAC;YACX,GAAG;YACH,GAAG;YACH,OAAO;YACP,UAAU;YACV,YAAY;YACZ,SAAS;YACT,MAAM;YACN,QAAQ;YACR,kBAAkB;YAClB,aAAa;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,GAAG;YACH,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;IACJ,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAE5D,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '@ms-cloudpack/bundle-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { handleErrorPortUnavailable } from './handleErrorPortUnavailable.js';\nimport { type TaskReporter, cyan } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport type { PackageImportPaths } from '@ms-cloudpack/package-utilities';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\nimport type { Server } from 'http';\nimport type { AppServer } from './types/AppServer.js';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n  packages,\n  packageImportPaths,\n  reporter,\n  packageHashes,\n  middlewareMode,\n  server,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  reporter: TaskReporter;\n  packageHashes: PackageHashes;\n  middlewareMode?: boolean;\n  server?: Server;\n}): Promise<AppServer> {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask(`Starting app server for \"${definition.name}\"`);\n\n  try {\n    const { app, close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      middlewareMode,\n      server,\n    });\n\n    createRoutes({\n      app,\n      url,\n      session,\n      definition,\n      bundleServer,\n      apiServer,\n      config,\n      packages,\n      packageImportPaths,\n      packageHashes,\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      app,\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    handleErrorPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAQtE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,EAC9B,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACb,cAAc,EACd,MAAM,GAaP;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,4BAA4B,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;IAE9E,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YACvD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,cAAc,EAAE,SAAS,EAAE,cAAc;YACzC,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,cAAc;YACd,MAAM;SACP,CAAC,CAAC;QAEH,YAAY,CAAC;YACX,GAAG;YACH,GAAG;YACH,OAAO;YACP,UAAU;YACV,YAAY;YACZ,SAAS;YACT,MAAM;YACN,QAAQ;YACR,kBAAkB;YAClB,aAAa;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,GAAG;YACH,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;IACJ,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAE5D,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '@ms-cloudpack/bundle-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { handleErrorPortUnavailable } from './handleErrorPortUnavailable.js';\nimport { type TaskReporter, cyan } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport type { PackageImportPaths } from '@ms-cloudpack/package-utilities';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\nimport type { Server } from 'http';\nimport type { AppServer } from './types/AppServer.js';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n  packages,\n  packageImportPaths,\n  reporter,\n  packageHashes,\n  middlewareMode,\n  server,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  reporter: TaskReporter;\n  packageHashes: PackageHashes;\n  middlewareMode?: boolean;\n  server?: Server;\n}): Promise<AppServer> {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask(`Starting app server for \"${definition.name}\"`);\n\n  try {\n    const { app, close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      requestHeaders: devServer?.requestHeaders,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      middlewareMode,\n      server,\n    });\n\n    createRoutes({\n      app,\n      url,\n      session,\n      definition,\n      bundleServer,\n      apiServer,\n      config,\n      packages,\n      packageImportPaths,\n      packageHashes,\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      app,\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    handleErrorPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}

package/lib/tsdoc-metadata.json

@@ -0,0 +1,11 @@
+// This file is read by tools that parse documentation comments conforming to the TSDoc standard.
+// It should be published with your NPM package.  It should not be tracked by Git.
+{
+  "tsdocVersion": "0.12",
+  "toolPackages": [
+    {
+      "packageName": "@microsoft/api-extractor",
+      "packageVersion": "7.39.4"
+    }
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/app-server",
-  "version": "0.1.33-beta.0",
+  "version": "0.2.0",
   "description": "An implementation of the App server for Cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,14 +14,14 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.31.6-beta.0",
-    "@ms-cloudpack/bundle-server": "^0.2.30-beta.0",
-    "@ms-cloudpack/bundler-types": "^0.25.0",
-    "@ms-cloudpack/config-types": "^0.5.1",
-    "@ms-cloudpack/create-express-app": "^1.4.4",
-    "@ms-cloudpack/overlay": "^0.16.79-beta.0",
-    "@ms-cloudpack/package-hashes": "^0.3.29",
-    "@ms-cloudpack/package-utilities": "^5.11.1",
+    "@ms-cloudpack/api-server": "^0.31.6",
+    "@ms-cloudpack/bundle-server": "^0.2.30",
+    "@ms-cloudpack/bundler-types": "^0.25.1",
+    "@ms-cloudpack/config-types": "^0.6.0",
+    "@ms-cloudpack/create-express-app": "^1.5.0",
+    "@ms-cloudpack/overlay": "^0.16.79",
+    "@ms-cloudpack/package-hashes": "^0.3.30",
+    "@ms-cloudpack/package-utilities": "^5.11.2",
     "@ms-cloudpack/path-string-parsing": "^1.2.0",
     "@ms-cloudpack/path-utilities": "^2.6.0",
     "@ms-cloudpack/task-reporter": "^0.11.1",