@ms-cloudpack/app-server 0.10.3 → 0.10.4

package/lib/createBootstrapRouteHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBootstrapRouteHandler.d.ts","sourceRoot":"","sources":["../src/createBootstrapRouteHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAMxD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAsB1E,KAAK,kCAAkC,GAAG,IAAI,CAC5C,OAAO,EACP,UAAU,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,CAChE,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,EACD,OAAO,EAAE,kCAAkC,UAE7B,OAAO,OAAO,QAAQ,UAqCrC"}
+{"version":3,"file":"createBootstrapRouteHandler.d.ts","sourceRoot":"","sources":["../src/createBootstrapRouteHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAKxD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAkB1E,KAAK,kCAAkC,GAAG,IAAI,CAC5C,OAAO,EACP,UAAU,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,CAChE,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,EACD,OAAO,EAAE,kCAAkC,UAE7B,OAAO,OAAO,QAAQ,UAqCrC"}

package/lib/createBootstrapRouteHandler.js

@@ -1,8 +1,8 @@
 import { createImportMap } from '@ms-cloudpack/import-map';
 import { join } from 'path';
 import { getBoostrapInlineScript, getInlineScripts } from './inlineScripts/getInlineScripts.js';
-import { getCookies } from './getCookies.js';
 import { slash } from '@ms-cloudpack/path-string-parsing';
+import { createPageSessionContext } from './createPageSessionContext.js';
 const getBootstrapScript = async (input) => {
     let bootstrapInlineScript = await getBoostrapInlineScript();
     // Remove the export statement from the inline script, the bootstrap can not be an esm.
@@ -19,7 +19,7 @@ export function createBootstrapRouteHandler(options, context) {
         (async () => {
             const { definitionName, exportEntry } = options;
             const { session } = context;
-            const { bundleServer: bundleServerUrl, apiServer: apiServerUrl } = session.urls;
+            const { bundleServer: bundleServerUrl } = session.urls;
             if (!bundleServerUrl) {
                 // Sanity check...
                 throw new Error('The bundle server URL is not yet set in the session (this is a Cloudpack bug).');
@@ -30,12 +30,12 @@ export function createBootstrapRouteHandler(options, context) {
                 urls: { bundleServer: bundleServerUrl },
             }));
             const inlineScripts = await getInlineScripts();
-            const cookies = getCookies(session, apiServerUrl, bundleServerUrl);
+            const pageSessionContext = createPageSessionContext(session);
             const entryScript = exportEntry && importMap.imports[slash(join(definitionName, exportEntry))];
             const overlayScript = importMap.imports['@ms-cloudpack/overlay'];
             const renderedContent = await getBootstrapScript({
                 importMap,
-                cookies,
+                pageSessionContext,
                 overlayScript,
                 inlineScripts,
                 entryScript,

package/lib/createBootstrapRouteHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBootstrapRouteHandler.js","sourceRoot":"","sources":["../src/createBootstrapRouteHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAkB,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAChG,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAG1D,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAMjC,EAAE,EAAE;IACH,IAAI,qBAAqB,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAE5D,uFAAuF;IACvF,qBAAqB,GAAG,qBAAqB,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAExE,oCAAoC;IACpC,6CAA6C;IAC7C,OAAO;MACH,qBAAqB;mCACQ,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;GACrD,CAAC;AACJ,CAAC,CAAC;AAOF,MAAM,UAAU,2BAA2B,CACzC,OAGC,EACD,OAA2C;IAE3C,OAAO,CAAC,IAAa,EAAE,GAAa,EAAE,EAAE;QACtC,CAAC,KAAK,IAAI,EAAE;YACV,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;YAEhD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;YAC5B,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAEhF,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,kBAAkB;gBAClB,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;YACpG,CAAC;YAED,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,MAAM,eAAe,CAAC;gBAC7D,GAAG,OAAO;gBACV,GAAG,OAAO;gBACV,IAAI,EAAE,EAAE,YAAY,EAAE,eAAe,EAAE;aACxC,CAAC,CAAC,CAAC;YAEJ,MAAM,aAAa,GAAG,MAAM,gBAAgB,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;YAC/F,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;YAEjE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC;gBAC/C,SAAS;gBACT,OAAO;gBACP,aAAa;gBACb,aAAa;gBACb,WAAW;aACZ,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC;QACxE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACjB,OAAO,CAAC,KAAK,CAAE,GAAa,EAAE,KAAK,IAAI,GAAG,CAAC,CAAC;YAC5C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport { createImportMap, type ImportMap } from '@ms-cloudpack/import-map';\nimport { join } from 'path';\nimport { getBoostrapInlineScript, getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { getCookies } from './getCookies.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { Request, Response } from '@ms-cloudpack/create-express-app';\n\nconst getBootstrapScript = async (input: {\n  inlineScripts: string[];\n  overlayScript: string;\n  importMap: ImportMap;\n  cookies: Record<string, string>;\n  entryScript?: string;\n}) => {\n  let bootstrapInlineScript = await getBoostrapInlineScript();\n\n  // Remove the export statement from the inline script, the bootstrap can not be an esm.\n  bootstrapInlineScript = bootstrapInlineScript.replace('export {};', '');\n\n  // Inject the boostrap inline script\n  // Call the bootstrap function with the input\n  return `\n    ${bootstrapInlineScript}\n    window.__cloudpack.bootstrap(${JSON.stringify(input)});\n  `;\n};\n\ntype CreateBootstrapRouteHandlerContext = Pick<\n  Context,\n  'packages' | 'packageImportPaths' | 'packageHashes' | 'session'\n>;\n\nexport function createBootstrapRouteHandler(\n  options: {\n    definitionName: string;\n    exportEntry?: string;\n  },\n  context: CreateBootstrapRouteHandlerContext,\n) {\n  return (_req: Request, res: Response) => {\n    (async () => {\n      const { definitionName, exportEntry } = options;\n\n      const { session } = context;\n      const { bundleServer: bundleServerUrl, apiServer: apiServerUrl } = session.urls;\n\n      if (!bundleServerUrl) {\n        // Sanity check...\n        throw new Error('The bundle server URL is not yet set in the session (this is a Cloudpack bug).');\n      }\n\n      const importMap = (session.importMap ??= await createImportMap({\n        ...context,\n        ...session,\n        urls: { bundleServer: bundleServerUrl },\n      }));\n\n      const inlineScripts = await getInlineScripts();\n      const cookies = getCookies(session, apiServerUrl, bundleServerUrl);\n      const entryScript = exportEntry && importMap.imports[slash(join(definitionName, exportEntry))];\n      const overlayScript = importMap.imports['@ms-cloudpack/overlay'];\n\n      const renderedContent = await getBootstrapScript({\n        importMap,\n        cookies,\n        overlayScript,\n        inlineScripts,\n        entryScript,\n      });\n\n      return res.type('application/javascript').send(renderedContent).end();\n    })().catch((err) => {\n      console.error((err as Error)?.stack || err);\n      return res.status(500).send(`Error loading app: ${err}`);\n    });\n  };\n}\n"]}
+{"version":3,"file":"createBootstrapRouteHandler.js","sourceRoot":"","sources":["../src/createBootstrapRouteHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAChG,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAG1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAqB,EAAE,EAAE;IACzD,IAAI,qBAAqB,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAE5D,uFAAuF;IACvF,qBAAqB,GAAG,qBAAqB,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAExE,oCAAoC;IACpC,6CAA6C;IAC7C,OAAO;MACH,qBAAqB;mCACQ,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;GACrD,CAAC;AACJ,CAAC,CAAC;AAOF,MAAM,UAAU,2BAA2B,CACzC,OAGC,EACD,OAA2C;IAE3C,OAAO,CAAC,IAAa,EAAE,GAAa,EAAE,EAAE;QACtC,CAAC,KAAK,IAAI,EAAE;YACV,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;YAEhD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;YAC5B,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAEvD,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,kBAAkB;gBAClB,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;YACpG,CAAC;YAED,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,MAAM,eAAe,CAAC;gBAC7D,GAAG,OAAO;gBACV,GAAG,OAAO;gBACV,IAAI,EAAE,EAAE,YAAY,EAAE,eAAe,EAAE;aACxC,CAAC,CAAC,CAAC;YAEJ,MAAM,aAAa,GAAG,MAAM,gBAAgB,EAAE,CAAC;YAC/C,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;YAC/F,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;YAEjE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC;gBAC/C,SAAS;gBACT,kBAAkB;gBAClB,aAAa;gBACb,aAAa;gBACb,WAAW;aACZ,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC;QACxE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACjB,OAAO,CAAC,KAAK,CAAE,GAAa,EAAE,KAAK,IAAI,GAAG,CAAC,CAAC;YAC5C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport { createImportMap } from '@ms-cloudpack/import-map';\nimport { join } from 'path';\nimport { getBoostrapInlineScript, getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport type { Request, Response } from '@ms-cloudpack/create-express-app';\nimport type { BootstrapInput } from '@ms-cloudpack/common-types-browser';\nimport { createPageSessionContext } from './createPageSessionContext.js';\n\nconst getBootstrapScript = async (input: BootstrapInput) => {\n  let bootstrapInlineScript = await getBoostrapInlineScript();\n\n  // Remove the export statement from the inline script, the bootstrap can not be an esm.\n  bootstrapInlineScript = bootstrapInlineScript.replace('export {};', '');\n\n  // Inject the boostrap inline script\n  // Call the bootstrap function with the input\n  return `\n    ${bootstrapInlineScript}\n    window.__cloudpack.bootstrap(${JSON.stringify(input)});\n  `;\n};\n\ntype CreateBootstrapRouteHandlerContext = Pick<\n  Context,\n  'packages' | 'packageImportPaths' | 'packageHashes' | 'session'\n>;\n\nexport function createBootstrapRouteHandler(\n  options: {\n    definitionName: string;\n    exportEntry?: string;\n  },\n  context: CreateBootstrapRouteHandlerContext,\n) {\n  return (_req: Request, res: Response) => {\n    (async () => {\n      const { definitionName, exportEntry } = options;\n\n      const { session } = context;\n      const { bundleServer: bundleServerUrl } = session.urls;\n\n      if (!bundleServerUrl) {\n        // Sanity check...\n        throw new Error('The bundle server URL is not yet set in the session (this is a Cloudpack bug).');\n      }\n\n      const importMap = (session.importMap ??= await createImportMap({\n        ...context,\n        ...session,\n        urls: { bundleServer: bundleServerUrl },\n      }));\n\n      const inlineScripts = await getInlineScripts();\n      const pageSessionContext = createPageSessionContext(session);\n      const entryScript = exportEntry && importMap.imports[slash(join(definitionName, exportEntry))];\n      const overlayScript = importMap.imports['@ms-cloudpack/overlay'];\n\n      const renderedContent = await getBootstrapScript({\n        importMap,\n        pageSessionContext,\n        overlayScript,\n        inlineScripts,\n        entryScript,\n      });\n\n      return res.type('application/javascript').send(renderedContent).end();\n    })().catch((err) => {\n      console.error((err as Error)?.stack || err);\n      return res.status(500).send(`Error loading app: ${err}`);\n    });\n  };\n}\n"]}

package/lib/createPageSessionContext.d.ts

@@ -0,0 +1,7 @@
+import type { Session } from '@ms-cloudpack/api-server';
+import type { PageSessionContext } from '@ms-cloudpack/common-types-browser';
+/**
+ * Create a page session context that needs to be on the page for Cloudpack to work properly.
+ */
+export declare function createPageSessionContext(session: Pick<Session, 'id' | 'sequence' | 'projectName' | 'urls'>): PageSessionContext;
+//# sourceMappingURL=createPageSessionContext.d.ts.map

package/lib/createPageSessionContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createPageSessionContext.d.ts","sourceRoot":"","sources":["../src/createPageSessionContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7E;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,UAAU,GAAG,aAAa,GAAG,MAAM,CAAC,GACjE,kBAAkB,CAOpB"}

package/lib/createPageSessionContext.js

@@ -0,0 +1,12 @@
+/**
+ * Create a page session context that needs to be on the page for Cloudpack to work properly.
+ */
+export function createPageSessionContext(session) {
+    return {
+        sessionId: session.id,
+        currentSequence: session.sequence,
+        apiUrl: session.urls.apiServer ?? '',
+        bundleServerUrl: session.urls.bundleServer ?? '',
+    };
+}
+//# sourceMappingURL=createPageSessionContext.js.map

package/lib/createPageSessionContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createPageSessionContext.js","sourceRoot":"","sources":["../src/createPageSessionContext.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAAkE;IAElE,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,eAAe,EAAE,OAAO,CAAC,QAAQ;QACjC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE;QACpC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE;KACjD,CAAC;AACJ,CAAC","sourcesContent":["import type { Session } from '@ms-cloudpack/api-server';\nimport type { PageSessionContext } from '@ms-cloudpack/common-types-browser';\n\n/**\n * Create a page session context that needs to be on the page for Cloudpack to work properly.\n */\nexport function createPageSessionContext(\n  session: Pick<Session, 'id' | 'sequence' | 'projectName' | 'urls'>,\n): PageSessionContext {\n  return {\n    sessionId: session.id,\n    currentSequence: session.sequence,\n    apiUrl: session.urls.apiServer ?? '',\n    bundleServerUrl: session.urls.bundleServer ?? '',\n  };\n}\n"]}

package/lib/createRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAIL,KAAK,WAAW,EAEjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kCAAkC,CAAC;AAUnF,UAAU,mBAAmB;IAC3B,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,KAAK,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,CAAC,CAAC;AAE1G;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,QAgDtF"}
+{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAKL,KAAK,WAAW,EAEjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kCAAkC,CAAC;AAUnF,UAAU,mBAAmB;IAC3B,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,KAAK,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,CAAC,CAAC;AAE1G;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,QAoDtF"}

package/lib/createRoutes.js

@@ -1,4 +1,4 @@
-import { isBootstrapRoute, isRenderedRoute, isStaticRoute, } from '@ms-cloudpack/common-types';
+import { isBootstrapRoute, isRedirectRoute, isRenderedRoute, isStaticRoute, } from '@ms-cloudpack/common-types';
 import { express } from '@ms-cloudpack/create-express-app';
 import { createImportMap } from '@ms-cloudpack/import-map';
 import { slash } from '@ms-cloudpack/path-string-parsing';
@@ -34,6 +34,11 @@ export function createRoutes(options, context) {
         if (isStaticRoute(route)) {
             app.use(route.match, express.static(path.resolve(appPath, route.staticPath)));
         }
+        else if (isRedirectRoute(route)) {
+            app.get(route.match, (req, res) => {
+                res.redirect(route.redirectTo);
+            });
+        }
         else if (isBootstrapRoute(route)) {
             app.get(route.match, createBootstrapRouteHandler({
                 exportEntry: route.exportEntry,
@@ -70,11 +75,8 @@ async function handleRequest(options, context) {
     const overlayScript = importMap.imports['@ms-cloudpack/overlay'];
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const entryScript = route.exportEntry && importMap.imports[slash(path.join(definition.name, route.exportEntry))];
-    // Set the appropriate Cloudpack headers/cookies in the response.
-    // TODO: setting the headers here prohibits cases where the page rendering is owned by existing server code
-    // that can only accept changing the scripts. We should consider moving to a model where an initial script
-    // fetch loads the import map and sets Cloudpack settings in local storage rather than headers/cookies.
-    setHeaders({ res, session });
+    // Set the appropriate Cloudpack headers in the response.
+    setHeaders({ res });
     const inlineScripts = await getInlineScripts();
     const { content, statusCode, contentType } = await renderRoute({
         ...options,

package/lib/createRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"createRoutes.js","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport {\n  isBootstrapRoute,\n  isRenderedRoute,\n  isStaticRoute,\n  type PackageJson,\n  type RenderedRoute,\n} from '@ms-cloudpack/common-types';\nimport type { Express, Request, Response } from '@ms-cloudpack/create-express-app';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport { createImportMap } from '@ms-cloudpack/import-map';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport { getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { renderRoute, type RouteInternal } from './renderRoute/renderRoute.js';\nimport { setHeaders } from './setHeaders.js';\nimport { createBootstrapRouteHandler } from './createBootstrapRouteHandler.js';\n\ninterface CreateRoutesOptions {\n  app: Express;\n  url: string;\n  definition: PackageJson;\n}\n\ntype CreateRoutesContext = Pick<Context, 'packages' | 'packageImportPaths' | 'packageHashes' | 'session'>;\n\n/**\n * Creates the routes for the express app based on the config.\n */\nexport function createRoutes(options: CreateRoutesOptions, context: CreateRoutesContext) {\n  const { app, ...otherOptions } = options;\n  const { session } = context;\n  const { config } = session;\n  const { appPath } = config;\n  const routes = [...(session.config.routes || [])];\n\n  if (!options.definition.name) {\n    throw new Error('Name field is required in the package.json file.');\n  }\n\n  // Only as a basic fallback if no routes are specified, add a default catch-all route.\n  // Adding this automatically has the risk of hiding errors, like if an unexpected path\n  // being requested, or a JS file somehow being loaded from the app server unexpectedly.\n  if (!routes.length) {\n    const fallbackRoute: RouteInternal = {\n      match: '*',\n      exportEntry: '.',\n      isDefaultFallback: true, // this internal property is read by renderRoute\n    };\n    routes.push(fallbackRoute);\n  }\n\n  for (const route of routes) {\n    if (isStaticRoute(route)) {\n      app.use(route.match, express.static(path.resolve(appPath, route.staticPath)));\n    } else if (isBootstrapRoute(route)) {\n      app.get(\n        route.match,\n        createBootstrapRouteHandler(\n          {\n            exportEntry: route.exportEntry,\n            definitionName: options.definition.name,\n          },\n          context,\n        ),\n      );\n    } else if (isRenderedRoute(route)) {\n      app.get(route.match, (req, res) => {\n        handleRequest({ ...otherOptions, route, req, res }, context).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error loading app: ${err}`);\n        });\n      });\n    } else {\n      throw new Error(`Unknown route: ${JSON.stringify(route)}`);\n    }\n  }\n}\n\nasync function handleRequest(\n  options: Omit<CreateRoutesOptions, 'app'> & {\n    req: Request;\n    res: Response;\n    route: RenderedRoute;\n  },\n  context: CreateRoutesContext,\n) {\n  const { req, res, definition, route, url } = options;\n  const { session } = context;\n  const { bundleServer } = session.urls;\n  if (!bundleServer) {\n    // Sanity check...\n    throw new Error('The bundle server URL is not yet set in the session (this is a Cloudpack bug).');\n  }\n\n  // Build the import map if it hasn't been built yet for this session version.\n  // (TS can't infer that urls.bundleServer is set on session from a check above.)\n  const importMap = (session.importMap ??= await createImportMap({ ...context, ...session, urls: { bundleServer } }));\n\n  // Parse the request path, extension, grab the overlay script path.\n  const requestPath = slash(req.path.substring(1));\n  const requestExt = path.extname(requestPath);\n  const overlayScript = importMap.imports['@ms-cloudpack/overlay'];\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n  const entryScript = route.exportEntry && importMap.imports[slash(path.join(definition.name!, route.exportEntry))];\n\n  // Set the appropriate Cloudpack headers/cookies in the response.\n  // TODO: setting the headers here prohibits cases where the page rendering is owned by existing server code\n  // that can only accept changing the scripts. We should consider moving to a model where an initial script\n  // fetch loads the import map and sets Cloudpack settings in local storage rather than headers/cookies.\n  setHeaders({ res, session });\n\n  const inlineScripts = await getInlineScripts();\n  const { content, statusCode, contentType } = await renderRoute({\n    ...options,\n    session,\n    baseUrl: url,\n    importMap,\n    overlayScript,\n    entryScript,\n    inlineScripts,\n  });\n\n  res.type(contentType).status(statusCode).send(content).end();\n\n  console.debug(`App server: Request: ${requestPath}, ext: ${requestExt}`);\n}\n"]}
+{"version":3,"file":"createRoutes.js","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,aAAa,GAGd,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAsB,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAU/E;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,OAA4B,EAAE,OAA4B;IACrF,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC;IACzC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAC3B,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC;IAElD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IAED,sFAAsF;IACtF,sFAAsF;IACtF,uFAAuF;IACvF,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,aAAa,GAAkB;YACnC,KAAK,EAAE,GAAG;YACV,WAAW,EAAE,GAAG;YAChB,iBAAiB,EAAE,IAAI,EAAE,gDAAgD;SAC1E,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAChF,CAAC;aAAM,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAChC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,GAAG,CACL,KAAK,CAAC,KAAK,EACX,2BAA2B,CACzB;gBACE,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;aACxC,EACD,OAAO,CACR,CACF,CAAC;QACJ,CAAC;aAAM,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAChC,aAAa,CAAC,EAAE,GAAG,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACzE,OAAO,CAAC,KAAK,CAAE,GAAa,EAAE,KAAK,IAAI,GAAG,CAAC,CAAC;oBAC5C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC,CAAC;gBACpD,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,OAIC,EACD,OAA4B;IAE5B,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACrD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IACtC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,kBAAkB;QAClB,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;IACpG,CAAC;IAED,6EAA6E;IAC7E,gFAAgF;IAChF,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,MAAM,eAAe,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;IAEpH,mEAAmE;IACnE,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACjE,oEAAoE;IACpE,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAK,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAElH,yDAAyD;IACzD,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAEpB,MAAM,aAAa,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAC/C,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,WAAW,CAAC;QAC7D,GAAG,OAAO;QACV,OAAO;QACP,OAAO,EAAE,GAAG;QACZ,SAAS;QACT,aAAa;QACb,WAAW;QACX,aAAa;KACd,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;IAE7D,OAAO,CAAC,KAAK,CAAC,wBAAwB,WAAW,UAAU,UAAU,EAAE,CAAC,CAAC;AAC3E,CAAC","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport {\n  isBootstrapRoute,\n  isRedirectRoute,\n  isRenderedRoute,\n  isStaticRoute,\n  type PackageJson,\n  type RenderedRoute,\n} from '@ms-cloudpack/common-types';\nimport type { Express, Request, Response } from '@ms-cloudpack/create-express-app';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport { createImportMap } from '@ms-cloudpack/import-map';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport { getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { renderRoute, type RouteInternal } from './renderRoute/renderRoute.js';\nimport { setHeaders } from './setHeaders.js';\nimport { createBootstrapRouteHandler } from './createBootstrapRouteHandler.js';\n\ninterface CreateRoutesOptions {\n  app: Express;\n  url: string;\n  definition: PackageJson;\n}\n\ntype CreateRoutesContext = Pick<Context, 'packages' | 'packageImportPaths' | 'packageHashes' | 'session'>;\n\n/**\n * Creates the routes for the express app based on the config.\n */\nexport function createRoutes(options: CreateRoutesOptions, context: CreateRoutesContext) {\n  const { app, ...otherOptions } = options;\n  const { session } = context;\n  const { config } = session;\n  const { appPath } = config;\n  const routes = [...(session.config.routes || [])];\n\n  if (!options.definition.name) {\n    throw new Error('Name field is required in the package.json file.');\n  }\n\n  // Only as a basic fallback if no routes are specified, add a default catch-all route.\n  // Adding this automatically has the risk of hiding errors, like if an unexpected path\n  // being requested, or a JS file somehow being loaded from the app server unexpectedly.\n  if (!routes.length) {\n    const fallbackRoute: RouteInternal = {\n      match: '*',\n      exportEntry: '.',\n      isDefaultFallback: true, // this internal property is read by renderRoute\n    };\n    routes.push(fallbackRoute);\n  }\n\n  for (const route of routes) {\n    if (isStaticRoute(route)) {\n      app.use(route.match, express.static(path.resolve(appPath, route.staticPath)));\n    } else if (isRedirectRoute(route)) {\n      app.get(route.match, (req, res) => {\n        res.redirect(route.redirectTo);\n      });\n    } else if (isBootstrapRoute(route)) {\n      app.get(\n        route.match,\n        createBootstrapRouteHandler(\n          {\n            exportEntry: route.exportEntry,\n            definitionName: options.definition.name,\n          },\n          context,\n        ),\n      );\n    } else if (isRenderedRoute(route)) {\n      app.get(route.match, (req, res) => {\n        handleRequest({ ...otherOptions, route, req, res }, context).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error loading app: ${err}`);\n        });\n      });\n    } else {\n      throw new Error(`Unknown route: ${JSON.stringify(route)}`);\n    }\n  }\n}\n\nasync function handleRequest(\n  options: Omit<CreateRoutesOptions, 'app'> & {\n    req: Request;\n    res: Response;\n    route: RenderedRoute;\n  },\n  context: CreateRoutesContext,\n) {\n  const { req, res, definition, route, url } = options;\n  const { session } = context;\n  const { bundleServer } = session.urls;\n  if (!bundleServer) {\n    // Sanity check...\n    throw new Error('The bundle server URL is not yet set in the session (this is a Cloudpack bug).');\n  }\n\n  // Build the import map if it hasn't been built yet for this session version.\n  // (TS can't infer that urls.bundleServer is set on session from a check above.)\n  const importMap = (session.importMap ??= await createImportMap({ ...context, ...session, urls: { bundleServer } }));\n\n  // Parse the request path, extension, grab the overlay script path.\n  const requestPath = slash(req.path.substring(1));\n  const requestExt = path.extname(requestPath);\n  const overlayScript = importMap.imports['@ms-cloudpack/overlay'];\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n  const entryScript = route.exportEntry && importMap.imports[slash(path.join(definition.name!, route.exportEntry))];\n\n  // Set the appropriate Cloudpack headers in the response.\n  setHeaders({ res });\n\n  const inlineScripts = await getInlineScripts();\n  const { content, statusCode, contentType } = await renderRoute({\n    ...options,\n    session,\n    baseUrl: url,\n    importMap,\n    overlayScript,\n    entryScript,\n    inlineScripts,\n  });\n\n  res.type(contentType).status(statusCode).send(content).end();\n\n  console.debug(`App server: Request: ${requestPath}, ext: ${requestExt}`);\n}\n"]}

package/lib/inlineScripts/bootstrap.inline.js

@@ -1,14 +1,12 @@
 window.__cloudpack ??= {};
-window.__cloudpack.bootstrap = ({ inlineScripts, overlayScript, importMap, cookies, entryScript }) => {
+window.__cloudpack.bootstrap = ({ inlineScripts, overlayScript, importMap, pageSessionContext, entryScript }) => {
     // Inject the import map
     const importMapScriptTag = document.createElement('script');
     importMapScriptTag.type = 'importmap';
     importMapScriptTag.textContent = JSON.stringify(importMap);
     document.head.appendChild(importMapScriptTag);
-    // Inject cookies into localStorage
-    Object.entries(cookies).forEach(([key, value]) => {
-        localStorage.setItem(key, value);
-    });
+    window.__cloudpack ??= {};
+    window.__cloudpack.pageSessionContext = pageSessionContext;
     // Inject the inline scripts
     for (const inlineScript of inlineScripts) {
         const inlineTag = document.createElement('script');

package/lib/inlineScripts/bootstrap.inline.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.inline.js","sourceRoot":"","sources":["../../src/inlineScripts/bootstrap.inline.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,WAAW,KAAK,EAAE,CAAC;AAC1B,MAAM,CAAC,WAAW,CAAC,SAAS,GAAG,CAAC,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE;IACnG,wBAAwB;IACxB,MAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC5D,kBAAkB,CAAC,IAAI,GAAG,WAAW,CAAC;IACtC,kBAAkB,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAE9C,mCAAmC;IACnC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC/C,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,4BAA4B;IAC5B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACnD,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC1B,SAAS,CAAC,WAAW,GAAG,YAAY,CAAC;QACrC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,4BAA4B;IAC5B,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC1D,gBAAgB,CAAC,IAAI,GAAG,QAAQ,CAAC;IACjC,gBAAgB,CAAC,GAAG,GAAG,aAAa,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAE5C,yBAAyB;IACzB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACxD,cAAc,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC/B,cAAc,CAAC,GAAG,GAAG,WAAW,CAAC;QACjC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC,CAAC","sourcesContent":["window.__cloudpack ??= {};\nwindow.__cloudpack.bootstrap = ({ inlineScripts, overlayScript, importMap, cookies, entryScript }) => {\n  // Inject the import map\n  const importMapScriptTag = document.createElement('script');\n  importMapScriptTag.type = 'importmap';\n  importMapScriptTag.textContent = JSON.stringify(importMap);\n  document.head.appendChild(importMapScriptTag);\n\n  // Inject cookies into localStorage\n  Object.entries(cookies).forEach(([key, value]) => {\n    localStorage.setItem(key, value);\n  });\n\n  // Inject the inline scripts\n  for (const inlineScript of inlineScripts) {\n    const inlineTag = document.createElement('script');\n    inlineTag.type = 'module';\n    inlineTag.textContent = inlineScript;\n    document.head.appendChild(inlineTag);\n  }\n\n  // Inject the overlay script\n  const overlayScriptTag = document.createElement('script');\n  overlayScriptTag.type = 'module';\n  overlayScriptTag.src = overlayScript;\n  document.head.appendChild(overlayScriptTag);\n\n  // Inject the main script\n  if (entryScript) {\n    const entryScriptTag = document.createElement('script');\n    entryScriptTag.type = 'module';\n    entryScriptTag.src = entryScript;\n    document.head.appendChild(entryScriptTag);\n  }\n};\n"]}
+{"version":3,"file":"bootstrap.inline.js","sourceRoot":"","sources":["../../src/inlineScripts/bootstrap.inline.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,WAAW,KAAK,EAAE,CAAC;AAC1B,MAAM,CAAC,WAAW,CAAC,SAAS,GAAG,CAAC,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,kBAAkB,EAAE,WAAW,EAAE,EAAE,EAAE;IAC9G,wBAAwB;IACxB,MAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC5D,kBAAkB,CAAC,IAAI,GAAG,WAAW,CAAC;IACtC,kBAAkB,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC3D,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAE9C,MAAM,CAAC,WAAW,KAAK,EAAE,CAAC;IAC1B,MAAM,CAAC,WAAW,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAE3D,4BAA4B;IAC5B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACnD,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC1B,SAAS,CAAC,WAAW,GAAG,YAAY,CAAC;QACrC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAED,4BAA4B;IAC5B,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC1D,gBAAgB,CAAC,IAAI,GAAG,QAAQ,CAAC;IACjC,gBAAgB,CAAC,GAAG,GAAG,aAAa,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAE5C,yBAAyB;IACzB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACxD,cAAc,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC/B,cAAc,CAAC,GAAG,GAAG,WAAW,CAAC;QACjC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC,CAAC","sourcesContent":["window.__cloudpack ??= {};\nwindow.__cloudpack.bootstrap = ({ inlineScripts, overlayScript, importMap, pageSessionContext, entryScript }) => {\n  // Inject the import map\n  const importMapScriptTag = document.createElement('script');\n  importMapScriptTag.type = 'importmap';\n  importMapScriptTag.textContent = JSON.stringify(importMap);\n  document.head.appendChild(importMapScriptTag);\n\n  window.__cloudpack ??= {};\n  window.__cloudpack.pageSessionContext = pageSessionContext;\n\n  // Inject the inline scripts\n  for (const inlineScript of inlineScripts) {\n    const inlineTag = document.createElement('script');\n    inlineTag.type = 'module';\n    inlineTag.textContent = inlineScript;\n    document.head.appendChild(inlineTag);\n  }\n\n  // Inject the overlay script\n  const overlayScriptTag = document.createElement('script');\n  overlayScriptTag.type = 'module';\n  overlayScriptTag.src = overlayScript;\n  document.head.appendChild(overlayScriptTag);\n\n  // Inject the main script\n  if (entryScript) {\n    const entryScriptTag = document.createElement('script');\n    entryScriptTag.type = 'module';\n    entryScriptTag.src = entryScript;\n    document.head.appendChild(entryScriptTag);\n  }\n};\n"]}

package/lib/inlineScripts/getBrowserCacheRatio.inline.js

@@ -1,22 +1,9 @@
 // This file must NOT import other files (except types), because they won't be resolved at runtime.
-// Typing hack to ensure this name is correct while working around the limitation on runtime imports
-const cloudpackBundleServerUrlCookie = 'cloudpack-bundle-server-url';
 const scriptLoadResults = {};
-function getCookieOrLocalStorage(cname) {
-    const decodedCookies = decodeURIComponent(document.cookie);
-    const cookies = decodedCookies.split(';');
-    const keyValues = cookies.map((cookie) => cookie.split('='));
-    const cookie = keyValues.find(([key]) => key.trim() === cname);
-    if (!cookie) {
-        const result = localStorage.getItem(cname);
-        if (result) {
-            return result;
-        }
-        throw new Error(`Cookie ${cname} not found`);
-    }
-    return cookie[1].trim();
+if (!window.__cloudpack?.pageSessionContext) {
+    throw new Error('window.__cloudpack.pageSessionContext is not defined');
 }
-const bundleServerUrl = getCookieOrLocalStorage(cloudpackBundleServerUrlCookie);
+const bundleServerUrl = window.__cloudpack.pageSessionContext.bundleServerUrl;
 function isPerformanceResourceTiming(entry) {
     return entry.entryType === 'resource';
 }

package/lib/inlineScripts/getBrowserCacheRatio.inline.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBrowserCacheRatio.inline.js","sourceRoot":"","sources":["../../src/inlineScripts/getBrowserCacheRatio.inline.ts"],"names":[],"mappings":"AAAA,mGAAmG;AAInG,oGAAoG;AACpG,MAAM,8BAA8B,GAA4C,6BAA6B,CAAC;AAE9G,MAAM,iBAAiB,GAAwC,EAAE,CAAC;AAElE,SAAS,uBAAuB,CAAC,KAAa;IAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,KAAK,CAAC,CAAC;IAC/D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,YAAY,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,eAAe,GAAG,uBAAuB,CAAC,8BAA8B,CAAC,CAAC;AAEhF,SAAS,2BAA2B,CAAC,KAAuB;IAC1D,OAAO,KAAK,CAAC,SAAS,KAAK,UAAU,CAAC;AACxC,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAsB;IACpD,IAAI,2BAA2B,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAC/E,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,CAAC;AACH,CAAC;AAED,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,CAAC,IAAI,EAAE,EAAE;IACpD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;QACrC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,4DAA4D;AAC5D,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;IAC7D,sBAAsB,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,0DAA0D;AAC1D,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAE3D,SAAS,oBAAoB;IAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,OAAO,CAAC,CAAC,MAAM,CAAC;IACjG,MAAM,KAAK,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC;IAEjE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,WAAW,KAAK,EAAE,CAAC;AAC1B,MAAM,CAAC,WAAW,CAAC,oBAAoB,GAAG,oBAAoB,CAAC","sourcesContent":["// This file must NOT import other files (except types), because they won't be resolved at runtime.\n\nimport type { cookieNames } from '../cookieNames.js';\n\n// Typing hack to ensure this name is correct while working around the limitation on runtime imports\nconst cloudpackBundleServerUrlCookie: (typeof cookieNames)['bundleServerUrl'] = 'cloudpack-bundle-server-url';\n\nconst scriptLoadResults: Record<string, 'cache' | 'network'> = {};\n\nfunction getCookieOrLocalStorage(cname: string) {\n  const decodedCookies = decodeURIComponent(document.cookie);\n  const cookies = decodedCookies.split(';');\n  const keyValues = cookies.map((cookie) => cookie.split('='));\n  const cookie = keyValues.find(([key]) => key.trim() === cname);\n  if (!cookie) {\n    const result = localStorage.getItem(cname);\n    if (result) {\n      return result;\n    }\n    throw new Error(`Cookie ${cname} not found`);\n  }\n\n  return cookie[1].trim();\n}\n\nconst bundleServerUrl = getCookieOrLocalStorage(cloudpackBundleServerUrlCookie);\n\nfunction isPerformanceResourceTiming(entry: PerformanceEntry): entry is PerformanceResourceTiming {\n  return entry.entryType === 'resource';\n}\n\nfunction handlePerformanceEntry(item: PerformanceEntry) {\n  if (isPerformanceResourceTiming(item) && item.name.startsWith(bundleServerUrl)) {\n    scriptLoadResults[item.name] = item.transferSize === 0 ? 'cache' : 'network';\n  }\n}\n\nconst perfObserver = new PerformanceObserver((list) => {\n  for (const item of list.getEntries()) {\n    handlePerformanceEntry(item);\n  }\n});\n\n// Get all the resources that were loaded before this script\nfor (const entry of performance.getEntriesByType('resource')) {\n  handlePerformanceEntry(entry);\n}\n\n// Observe all resources that are loaded after this script\nperfObserver.observe({ type: 'resource', buffered: true });\n\nfunction getBrowserCacheRatio() {\n  const cacheCount = Object.values(scriptLoadResults).filter((source) => source == 'cache').length;\n  const ratio = cacheCount / Object.keys(scriptLoadResults).length;\n\n  return ratio;\n}\n\nwindow.__cloudpack ??= {};\nwindow.__cloudpack.getBrowserCacheRatio = getBrowserCacheRatio;\n"]}
+{"version":3,"file":"getBrowserCacheRatio.inline.js","sourceRoot":"","sources":["../../src/inlineScripts/getBrowserCacheRatio.inline.ts"],"names":[],"mappings":"AAAA,mGAAmG;AAEnG,MAAM,iBAAiB,GAAwC,EAAE,CAAC;AAElE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,kBAAkB,EAAE,CAAC;IAC5C,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,eAAe,CAAC;AAE9E,SAAS,2BAA2B,CAAC,KAAuB;IAC1D,OAAO,KAAK,CAAC,SAAS,KAAK,UAAU,CAAC;AACxC,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAsB;IACpD,IAAI,2BAA2B,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAC/E,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,CAAC;AACH,CAAC;AAED,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,CAAC,IAAI,EAAE,EAAE;IACpD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;QACrC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,4DAA4D;AAC5D,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;IAC7D,sBAAsB,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED,0DAA0D;AAC1D,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAE3D,SAAS,oBAAoB;IAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,OAAO,CAAC,CAAC,MAAM,CAAC;IACjG,MAAM,KAAK,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC;IAEjE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,WAAW,KAAK,EAAE,CAAC;AAC1B,MAAM,CAAC,WAAW,CAAC,oBAAoB,GAAG,oBAAoB,CAAC","sourcesContent":["// This file must NOT import other files (except types), because they won't be resolved at runtime.\n\nconst scriptLoadResults: Record<string, 'cache' | 'network'> = {};\n\nif (!window.__cloudpack?.pageSessionContext) {\n  throw new Error('window.__cloudpack.pageSessionContext is not defined');\n}\n\nconst bundleServerUrl = window.__cloudpack.pageSessionContext.bundleServerUrl;\n\nfunction isPerformanceResourceTiming(entry: PerformanceEntry): entry is PerformanceResourceTiming {\n  return entry.entryType === 'resource';\n}\n\nfunction handlePerformanceEntry(item: PerformanceEntry) {\n  if (isPerformanceResourceTiming(item) && item.name.startsWith(bundleServerUrl)) {\n    scriptLoadResults[item.name] = item.transferSize === 0 ? 'cache' : 'network';\n  }\n}\n\nconst perfObserver = new PerformanceObserver((list) => {\n  for (const item of list.getEntries()) {\n    handlePerformanceEntry(item);\n  }\n});\n\n// Get all the resources that were loaded before this script\nfor (const entry of performance.getEntriesByType('resource')) {\n  handlePerformanceEntry(entry);\n}\n\n// Observe all resources that are loaded after this script\nperfObserver.observe({ type: 'resource', buffered: true });\n\nfunction getBrowserCacheRatio() {\n  const cacheCount = Object.values(scriptLoadResults).filter((source) => source == 'cache').length;\n  const ratio = cacheCount / Object.keys(scriptLoadResults).length;\n\n  return ratio;\n}\n\nwindow.__cloudpack ??= {};\nwindow.__cloudpack.getBrowserCacheRatio = getBrowserCacheRatio;\n"]}

package/lib/renderRoute/renderRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderRoute.d.ts","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAOhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,yBAAyB,EAAqB,MAAM,+BAA+B,CAAC;AAKlG,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAE5E;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAsDjG"}
+{"version":3,"file":"renderRoute.d.ts","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAOhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,yBAAyB,EAAqB,MAAM,+BAA+B,CAAC;AAMlG,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAE5E;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAsDjG"}

package/lib/renderRoute/renderRoute.js

@@ -5,6 +5,7 @@ import path from 'path';
 import { pathToFileURL } from 'url';
 import { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';
 import { getHtmlErrorResponse } from './getHtmlErrorResponse.js';
+import { createPageSessionContext } from '../createPageSessionContext.js';
 /**
  * Get the response for the given route. If the route has a custom render script, use that.
  * Returns an error response if the file referenced by the script doesn't exist or throws an error.
@@ -140,6 +141,14 @@ function injectScripts(options, result) {
             // Inject the import map at the top of the head, in case other scripts use it
             addScript({ document, type: 'importmap', prepend: true, content: JSON.stringify(importMap, null, 2) });
         }
+        if (overlayScript || inlineScripts.length > 0) {
+            addScript({
+                document,
+                content: `
+        window.__cloudpack ??= {};
+        window.__cloudpack.pageSessionContext = ${JSON.stringify(createPageSessionContext(options.session))};`,
+            });
+        }
         for (const inlineScript of inlineScripts) {
             addScript({ document, content: inlineScript });
         }

package/lib/renderRoute/renderRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderRoute.js","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { RenderedRoute } from '@ms-cloudpack/common-types';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport fsPromises from 'fs/promises';\nimport { JSDOM } from 'jsdom';\nimport path from 'path';\nimport { pathToFileURL } from 'url';\nimport type { RenderRouteFunction } from '../types/RenderRouteFunction.js';\nimport type { RenderRouteOptions } from '../types/RenderRouteOptions.js';\nimport type { CompleteRenderRouteResult, RenderRouteResult } from '../types/RenderRouteResult.js';\nimport type { RenderRouteScript } from '../types/RenderRouteScript.js';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { getHtmlErrorResponse } from './getHtmlErrorResponse.js';\n\nexport type RouteInternal = RenderedRoute & { isDefaultFallback?: boolean };\n\n/**\n * Get the response for the given route. If the route has a custom render script, use that.\n * Returns an error response if the file referenced by the script doesn't exist or throws an error.\n */\nexport async function renderRoute(options: RenderRouteOptions): Promise<CompleteRenderRouteResult> {\n  const { route, session, req } = options;\n  const { config } = session;\n  const { appPath } = config;\n\n  // Get the request path and extension (the URL.pathname conversion gets rid of any query or hash)\n  const requestPath = makeUrl(req.url, options.baseUrl).pathname;\n  const requestExt = path.extname(requestPath);\n  // Determine whether HTML is (probably) an acceptable response type (can be refined later if needed).\n  // In theory we should be able to use req.accepts() but not all requests set the accept header.\n  const isHtmlAcceptable =\n    (!requestExt || requestExt.startsWith('.htm')) && !req.xhr && isHtmlType(req.headers.accept || '*/*');\n\n  // Get an initial result from either the render script or default handler.\n  let rawResult: RenderRouteResult;\n  const renderScriptPath = route.renderScript && path.resolve(appPath, route.renderScript);\n  if (renderScriptPath) {\n    const scriptExt = path.extname(renderScriptPath).toLowerCase();\n    if (scriptExt === '.html' || scriptExt === '.htm') {\n      rawResult = await readStaticHtml(renderScriptPath);\n    } else {\n      rawResult = await renderCustomScript({ ...options, renderScriptPath });\n    }\n  } else {\n    rawResult = await getDefaultHtmlResponse(options);\n  }\n\n  const result: CompleteRenderRouteResult = {\n    contentType: 'text/html',\n    statusCode: 200,\n    ...(typeof rawResult === 'string' ? { content: rawResult } : rawResult),\n  };\n\n  // If it's HTML and a success statusCode, inject the import map and appropriate scripts.\n  if (result.statusCode === 200 && isHtmlType(result.contentType)) {\n    // First verify that we're not accidentally returning HTML if a different file type is requested.\n    // This could happen for overly broad route matches such as '*', or if no routes are configured.\n    if (!isHtmlAcceptable) {\n      const renderer = route.renderScript ? `renderScript \"${renderScriptPath}\"` : 'the default renderer';\n      const content = (route as RouteInternal).isDefaultFallback\n        ? // no routes configured\n          `Cloudpack's default route can only return HTML, but this appears to be a non-HTML request. ` +\n          `Please add a route under devServer.routes in the cloudpack config.`\n        : // route with or without custom renderer\n          `Route \"${route.match}\" with ${renderer} returned HTML, but this appears to be a non-HTML request. ` +\n          `This is likely a misconfiguration of devServer.routes in the cloudpack config.`;\n      return { statusCode: 500, contentType: 'text/plain', content };\n    }\n\n    // Inject the import map and scripts.\n    injectScripts(options, result);\n  }\n\n  return result;\n}\n\nfunction isHtmlType(acceptOrContentType: string) {\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation/List_of_default_Accept_values\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types\n  return acceptOrContentType\n    .split(',')\n    .map((s) => s.split(';')[0].trim())\n    .some((mime) => mime === '*/*' || /xml|x?html/i.test(mime) || /^(text|application)\\/\\*$/.test(mime));\n}\n\n/**\n * Load the default export from a JS file passed as the `renderScript` in a route,\n * and return either the result of running the function, or an error page if something fails.\n */\nasync function renderCustomScript(\n  params: RenderRouteOptions & { renderScriptPath: string },\n): Promise<RenderRouteResult> {\n  const { renderScriptPath, ...options } = params;\n  // Get the html factory function from a script default export.\n  const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n  // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n  // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n  // the file if it exists, or a hash of the content, or even the timestamp of the file.\n  let cacheBreakerQueryParam = `?t=${Date.now()}`;\n  try {\n    const { mtime } = await fsPromises.stat(renderScriptPath);\n    cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n  } catch {\n    /* no-op */\n  }\n\n  // Try importing the script\n  let createHtml: RenderRouteFunction | undefined;\n  let errorMessage: string | undefined;\n  try {\n    const importResult = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as RenderRouteScript).default;\n    if (typeof importResult === 'function') {\n      createHtml = importResult;\n    } else {\n      errorMessage = `The render script at \"${renderScriptPath}\" does not export a default function.`;\n    }\n  } catch (e) {\n    errorMessage = `Error importing render script at \"${renderScriptUrl}\":\\n${(e as Error).stack || e}`;\n  }\n\n  if (createHtml) {\n    // Try running the script\n    try {\n      return await createHtml(options);\n    } catch (e) {\n      errorMessage = `Error running render script at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    }\n  }\n\n  // Return an error page. Doing this instead of returning a default or empty response ensures that\n  // the user is aware of any configuration issues.\n  errorMessage ??= `Unknown error loading render script at \"${renderScriptPath}\".`;\n  console.error(errorMessage);\n  return getHtmlErrorResponse(errorMessage);\n}\n\n/**\n * Modify the HTML response by injecting the import map, inline scripts, and entry/overlay scripts.\n *\n * Note that this just logs an error rather than returning an error response if something fails, for now.\n */\nfunction injectScripts(options: RenderRouteOptions, result: CompleteRenderRouteResult): void {\n  const { route, overlayScript, entryScript, inlineScripts, importMap } = options;\n  let jsdom: JSDOM;\n  try {\n    jsdom = new JSDOM(result.content, { contentType: result.contentType } as ConstructorParameters<typeof JSDOM>[1]);\n  } catch (e) {\n    // Trying to write a test for the above, it seemed very permissive, but catch just in case\n    console.error(`Error parsing html response for rendering route \"${route.match}\":\\n${(e as Error).stack || e}`);\n    return;\n  }\n\n  try {\n    const { document } = jsdom.window;\n\n    if (entryScript || overlayScript) {\n      // Inject the import map at the top of the head, in case other scripts use it\n      addScript({ document, type: 'importmap', prepend: true, content: JSON.stringify(importMap, null, 2) });\n    }\n\n    for (const inlineScript of inlineScripts) {\n      addScript({ document, content: inlineScript });\n    }\n\n    // inject the overlay and entry scripts\n    addScript({ document, url: overlayScript });\n    addScript({ document, url: entryScript });\n\n    result.content = jsdom.serialize();\n  } catch (e) {\n    console.error(`Error injecting scripts for route \"${route.match}\":\\n${(e as Error).stack || e}`);\n  }\n}\n\n/**\n * Helper function to add a script to the document.\n */\nfunction addScript(params: { document: Document; type?: string; prepend?: boolean; url?: string; content?: string }) {\n  const { document, type = 'module', prepend, url, content } = params;\n  if (!url && !content) {\n    return;\n  }\n\n  const script = document.createElement('script');\n  script.type = type;\n  if (url) {\n    script.src = url;\n  } else if (content) {\n    script.innerHTML = content;\n  }\n\n  if (prepend) {\n    document.head.prepend(script);\n  } else {\n    document.head.appendChild(script);\n  }\n}\n\n/**\n * Read a static HTML file, or return an error response if the file can't be read.\n */\nasync function readStaticHtml(renderScriptPath: string): Promise<RenderRouteResult> {\n  try {\n    return (await fsPromises.readFile(renderScriptPath, 'utf8')) || '';\n  } catch (e) {\n    const message = `Error reading HTML file at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    console.error(message);\n    return getHtmlErrorResponse(message);\n  }\n}\n"]}
+{"version":3,"file":"renderRoute.js","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { RenderedRoute } from '@ms-cloudpack/common-types';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport fsPromises from 'fs/promises';\nimport { JSDOM } from 'jsdom';\nimport path from 'path';\nimport { pathToFileURL } from 'url';\nimport type { RenderRouteFunction } from '../types/RenderRouteFunction.js';\nimport type { RenderRouteOptions } from '../types/RenderRouteOptions.js';\nimport type { CompleteRenderRouteResult, RenderRouteResult } from '../types/RenderRouteResult.js';\nimport type { RenderRouteScript } from '../types/RenderRouteScript.js';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { getHtmlErrorResponse } from './getHtmlErrorResponse.js';\nimport { createPageSessionContext } from '../createPageSessionContext.js';\n\nexport type RouteInternal = RenderedRoute & { isDefaultFallback?: boolean };\n\n/**\n * Get the response for the given route. If the route has a custom render script, use that.\n * Returns an error response if the file referenced by the script doesn't exist or throws an error.\n */\nexport async function renderRoute(options: RenderRouteOptions): Promise<CompleteRenderRouteResult> {\n  const { route, session, req } = options;\n  const { config } = session;\n  const { appPath } = config;\n\n  // Get the request path and extension (the URL.pathname conversion gets rid of any query or hash)\n  const requestPath = makeUrl(req.url, options.baseUrl).pathname;\n  const requestExt = path.extname(requestPath);\n  // Determine whether HTML is (probably) an acceptable response type (can be refined later if needed).\n  // In theory we should be able to use req.accepts() but not all requests set the accept header.\n  const isHtmlAcceptable =\n    (!requestExt || requestExt.startsWith('.htm')) && !req.xhr && isHtmlType(req.headers.accept || '*/*');\n\n  // Get an initial result from either the render script or default handler.\n  let rawResult: RenderRouteResult;\n  const renderScriptPath = route.renderScript && path.resolve(appPath, route.renderScript);\n  if (renderScriptPath) {\n    const scriptExt = path.extname(renderScriptPath).toLowerCase();\n    if (scriptExt === '.html' || scriptExt === '.htm') {\n      rawResult = await readStaticHtml(renderScriptPath);\n    } else {\n      rawResult = await renderCustomScript({ ...options, renderScriptPath });\n    }\n  } else {\n    rawResult = await getDefaultHtmlResponse(options);\n  }\n\n  const result: CompleteRenderRouteResult = {\n    contentType: 'text/html',\n    statusCode: 200,\n    ...(typeof rawResult === 'string' ? { content: rawResult } : rawResult),\n  };\n\n  // If it's HTML and a success statusCode, inject the import map and appropriate scripts.\n  if (result.statusCode === 200 && isHtmlType(result.contentType)) {\n    // First verify that we're not accidentally returning HTML if a different file type is requested.\n    // This could happen for overly broad route matches such as '*', or if no routes are configured.\n    if (!isHtmlAcceptable) {\n      const renderer = route.renderScript ? `renderScript \"${renderScriptPath}\"` : 'the default renderer';\n      const content = (route as RouteInternal).isDefaultFallback\n        ? // no routes configured\n          `Cloudpack's default route can only return HTML, but this appears to be a non-HTML request. ` +\n          `Please add a route under devServer.routes in the cloudpack config.`\n        : // route with or without custom renderer\n          `Route \"${route.match}\" with ${renderer} returned HTML, but this appears to be a non-HTML request. ` +\n          `This is likely a misconfiguration of devServer.routes in the cloudpack config.`;\n      return { statusCode: 500, contentType: 'text/plain', content };\n    }\n\n    // Inject the import map and scripts.\n    injectScripts(options, result);\n  }\n\n  return result;\n}\n\nfunction isHtmlType(acceptOrContentType: string) {\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation/List_of_default_Accept_values\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types\n  return acceptOrContentType\n    .split(',')\n    .map((s) => s.split(';')[0].trim())\n    .some((mime) => mime === '*/*' || /xml|x?html/i.test(mime) || /^(text|application)\\/\\*$/.test(mime));\n}\n\n/**\n * Load the default export from a JS file passed as the `renderScript` in a route,\n * and return either the result of running the function, or an error page if something fails.\n */\nasync function renderCustomScript(\n  params: RenderRouteOptions & { renderScriptPath: string },\n): Promise<RenderRouteResult> {\n  const { renderScriptPath, ...options } = params;\n  // Get the html factory function from a script default export.\n  const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n  // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n  // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n  // the file if it exists, or a hash of the content, or even the timestamp of the file.\n  let cacheBreakerQueryParam = `?t=${Date.now()}`;\n  try {\n    const { mtime } = await fsPromises.stat(renderScriptPath);\n    cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n  } catch {\n    /* no-op */\n  }\n\n  // Try importing the script\n  let createHtml: RenderRouteFunction | undefined;\n  let errorMessage: string | undefined;\n  try {\n    const importResult = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as RenderRouteScript).default;\n    if (typeof importResult === 'function') {\n      createHtml = importResult;\n    } else {\n      errorMessage = `The render script at \"${renderScriptPath}\" does not export a default function.`;\n    }\n  } catch (e) {\n    errorMessage = `Error importing render script at \"${renderScriptUrl}\":\\n${(e as Error).stack || e}`;\n  }\n\n  if (createHtml) {\n    // Try running the script\n    try {\n      return await createHtml(options);\n    } catch (e) {\n      errorMessage = `Error running render script at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    }\n  }\n\n  // Return an error page. Doing this instead of returning a default or empty response ensures that\n  // the user is aware of any configuration issues.\n  errorMessage ??= `Unknown error loading render script at \"${renderScriptPath}\".`;\n  console.error(errorMessage);\n  return getHtmlErrorResponse(errorMessage);\n}\n\n/**\n * Modify the HTML response by injecting the import map, inline scripts, and entry/overlay scripts.\n *\n * Note that this just logs an error rather than returning an error response if something fails, for now.\n */\nfunction injectScripts(options: RenderRouteOptions, result: CompleteRenderRouteResult): void {\n  const { route, overlayScript, entryScript, inlineScripts, importMap } = options;\n  let jsdom: JSDOM;\n  try {\n    jsdom = new JSDOM(result.content, { contentType: result.contentType } as ConstructorParameters<typeof JSDOM>[1]);\n  } catch (e) {\n    // Trying to write a test for the above, it seemed very permissive, but catch just in case\n    console.error(`Error parsing html response for rendering route \"${route.match}\":\\n${(e as Error).stack || e}`);\n    return;\n  }\n\n  try {\n    const { document } = jsdom.window;\n\n    if (entryScript || overlayScript) {\n      // Inject the import map at the top of the head, in case other scripts use it\n      addScript({ document, type: 'importmap', prepend: true, content: JSON.stringify(importMap, null, 2) });\n    }\n\n    if (overlayScript || inlineScripts.length > 0) {\n      addScript({\n        document,\n        content: `\n        window.__cloudpack ??= {};\n        window.__cloudpack.pageSessionContext = ${JSON.stringify(createPageSessionContext(options.session))};`,\n      });\n    }\n\n    for (const inlineScript of inlineScripts) {\n      addScript({ document, content: inlineScript });\n    }\n\n    // inject the overlay and entry scripts\n    addScript({ document, url: overlayScript });\n    addScript({ document, url: entryScript });\n\n    result.content = jsdom.serialize();\n  } catch (e) {\n    console.error(`Error injecting scripts for route \"${route.match}\":\\n${(e as Error).stack || e}`);\n  }\n}\n\n/**\n * Helper function to add a script to the document.\n */\nfunction addScript(params: { document: Document; type?: string; prepend?: boolean; url?: string; content?: string }) {\n  const { document, type = 'module', prepend, url, content } = params;\n  if (!url && !content) {\n    return;\n  }\n\n  const script = document.createElement('script');\n  script.type = type;\n  if (url) {\n    script.src = url;\n  } else if (content) {\n    script.innerHTML = content;\n  }\n\n  if (prepend) {\n    document.head.prepend(script);\n  } else {\n    document.head.appendChild(script);\n  }\n}\n\n/**\n * Read a static HTML file, or return an error response if the file can't be read.\n */\nasync function readStaticHtml(renderScriptPath: string): Promise<RenderRouteResult> {\n  try {\n    return (await fsPromises.readFile(renderScriptPath, 'utf8')) || '';\n  } catch (e) {\n    const message = `Error reading HTML file at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    console.error(message);\n    return getHtmlErrorResponse(message);\n  }\n}\n"]}

package/lib/setHeaders.d.ts

@@ -1,10 +1,8 @@
 import type { Response } from '@ms-cloudpack/create-express-app';
-import type { Session } from '@ms-cloudpack/api-server';
 /**
- * Set the Cloudpack headers and cookies in the response.
+ * Set the Cloudpack headers in the response.
  */
 export declare function setHeaders(params: {
     res: Response;
-    session: Pick<Session, 'id' | 'sequence' | 'projectName' | 'sessionVersion' | 'urls'>;
 }): void;
 //# sourceMappingURL=setHeaders.d.ts.map

package/lib/setHeaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setHeaders.d.ts","sourceRoot":"","sources":["../src/setHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE;IACjC,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,UAAU,GAAG,aAAa,GAAG,gBAAgB,GAAG,MAAM,CAAC,CAAC;CACvF,QAWA"}
+{"version":3,"file":"setHeaders.d.ts","sourceRoot":"","sources":["../src/setHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAEjE;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE,QAAQ,CAAA;CAAE,QAKnD"}

package/lib/setHeaders.js

@@ -1,15 +1,9 @@
-import { getCookies } from './getCookies.js';
 /**
- * Set the Cloudpack headers and cookies in the response.
+ * Set the Cloudpack headers in the response.
  */
 export function setHeaders(params) {
-    const { res, session } = params;
-    const { apiServer, bundleServer } = session.urls;
+    const { res } = params;
     res.header('Cache-Control', 'no-cache');
     res.header('Access-Control-Allow-Origin', '*');
-    const cookies = getCookies(session, apiServer, bundleServer);
-    for (const [key, value] of Object.entries(cookies)) {
-        res.cookie(key, value);
-    }
 }
 //# sourceMappingURL=setHeaders.js.map

package/lib/setHeaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"setHeaders.js","sourceRoot":"","sources":["../src/setHeaders.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,MAG1B;IACC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjD,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IAC7D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACzB,CAAC;AACH,CAAC","sourcesContent":["import type { Response } from '@ms-cloudpack/create-express-app';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport { getCookies } from './getCookies.js';\n\n/**\n * Set the Cloudpack headers and cookies in the response.\n */\nexport function setHeaders(params: {\n  res: Response;\n  session: Pick<Session, 'id' | 'sequence' | 'projectName' | 'sessionVersion' | 'urls'>;\n}) {\n  const { res, session } = params;\n  const { apiServer, bundleServer } = session.urls;\n\n  res.header('Cache-Control', 'no-cache');\n  res.header('Access-Control-Allow-Origin', '*');\n\n  const cookies = getCookies(session, apiServer, bundleServer);\n  for (const [key, value] of Object.entries(cookies)) {\n    res.cookie(key, value);\n  }\n}\n"]}
+{"version":3,"file":"setHeaders.js","sourceRoot":"","sources":["../src/setHeaders.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,MAAyB;IAClD,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;AACjD,CAAC","sourcesContent":["import type { Response } from '@ms-cloudpack/create-express-app';\n\n/**\n * Set the Cloudpack headers in the response.\n */\nexport function setHeaders(params: { res: Response }) {\n  const { res } = params;\n\n  res.header('Cache-Control', 'no-cache');\n  res.header('Access-Control-Allow-Origin', '*');\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/app-server",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "An implementation of the App server for Cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,18 +14,19 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.46.6",
-    "@ms-cloudpack/bundle-server": "^0.4.32",
-    "@ms-cloudpack/common-types": "^0.11.0",
-    "@ms-cloudpack/create-express-app": "^1.6.26",
-    "@ms-cloudpack/import-map": "^0.5.20",
-    "@ms-cloudpack/overlay": "^0.17.30",
+    "@ms-cloudpack/api-server": "^0.47.0",
+    "@ms-cloudpack/bundle-server": "^0.4.33",
+    "@ms-cloudpack/common-types": "^0.12.0",
+    "@ms-cloudpack/create-express-app": "^1.6.27",
+    "@ms-cloudpack/import-map": "^0.5.21",
+    "@ms-cloudpack/overlay": "^0.17.31",
     "@ms-cloudpack/path-string-parsing": "^1.2.3",
-    "@ms-cloudpack/path-utilities": "^2.7.23",
+    "@ms-cloudpack/path-utilities": "^2.7.24",
     "@ms-cloudpack/task-reporter": "^0.14.1",
     "jsdom": "^24.0.0"
   },
   "devDependencies": {
+    "@ms-cloudpack/common-types-browser": "^0.2.0",
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
     "@ms-cloudpack/scripts": "^0.0.1",
     "@ms-cloudpack/test-utilities": "^0.5.0",

package/lib/cookieNames.d.ts

@@ -1,8 +0,0 @@
-export declare const cookieNames: {
-    readonly bundleServerUrl: "cloudpack-bundle-server-url";
-    readonly sessionId: string;
-    readonly sessionSequence: string;
-    readonly apiUrl: string;
-};
-export declare function getCloudpackSessionVersionCookie(projectName: string): string;
-//# sourceMappingURL=cookieNames.d.ts.map

package/lib/cookieNames.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cookieNames.d.ts","sourceRoot":"","sources":["../src/cookieNames.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW;;;;;CAGd,CAAC;AAEX,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,MAAM,UAEnE"}

package/lib/cookieNames.js

@@ -1,9 +0,0 @@
-import { cookieNames as overlayCookieNames } from '@ms-cloudpack/overlay/constants';
-export const cookieNames = {
-    ...overlayCookieNames,
-    bundleServerUrl: 'cloudpack-bundle-server-url',
-};
-export function getCloudpackSessionVersionCookie(projectName) {
-    return 'cloudpack-sessionVersion-' + projectName;
-}
-//# sourceMappingURL=cookieNames.js.map

package/lib/cookieNames.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cookieNames.js","sourceRoot":"","sources":["../src/cookieNames.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAEpF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,kBAAkB;IACrB,eAAe,EAAE,6BAA6B;CACtC,CAAC;AAEX,MAAM,UAAU,gCAAgC,CAAC,WAAmB;IAClE,OAAO,2BAA2B,GAAG,WAAW,CAAC;AACnD,CAAC","sourcesContent":["import { cookieNames as overlayCookieNames } from '@ms-cloudpack/overlay/constants';\n\nexport const cookieNames = {\n  ...overlayCookieNames,\n  bundleServerUrl: 'cloudpack-bundle-server-url',\n} as const;\n\nexport function getCloudpackSessionVersionCookie(projectName: string) {\n  return 'cloudpack-sessionVersion-' + projectName;\n}\n"]}

package/lib/getCookies.d.ts

@@ -1,6 +0,0 @@
-import type { Session } from '@ms-cloudpack/api-server';
-/**
- * Get the cookies that needs to be written on the page for Cloudpack to work properly.
- */
-export declare function getCookies(session: Pick<Session, 'id' | 'sequence' | 'projectName' | 'sessionVersion'>, apiServerUrl?: string, bundleServerUrl?: string): Record<string, string>;
-//# sourceMappingURL=getCookies.d.ts.map

package/lib/getCookies.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCookies.d.ts","sourceRoot":"","sources":["../src/getCookies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD;;GAEG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,UAAU,GAAG,aAAa,GAAG,gBAAgB,CAAC,EAC5E,YAAY,CAAC,EAAE,MAAM,EACrB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxB"}

package/lib/getCookies.js

@@ -1,14 +0,0 @@
-import { cookieNames, getCloudpackSessionVersionCookie } from './cookieNames.js';
-/**
- * Get the cookies that needs to be written on the page for Cloudpack to work properly.
- */
-export function getCookies(session, apiServerUrl, bundleServerUrl) {
-    return {
-        [cookieNames.sessionId]: session.id,
-        [cookieNames.sessionSequence]: session.sequence.toString(),
-        [getCloudpackSessionVersionCookie(session.projectName)]: session.sessionVersion.toString(),
-        [cookieNames.apiUrl]: apiServerUrl ?? '',
-        [cookieNames.bundleServerUrl]: bundleServerUrl ?? '',
-    };
-}
-//# sourceMappingURL=getCookies.js.map

package/lib/getCookies.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCookies.js","sourceRoot":"","sources":["../src/getCookies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,gCAAgC,EAAE,MAAM,kBAAkB,CAAC;AAEjF;;GAEG;AACH,MAAM,UAAU,UAAU,CACxB,OAA4E,EAC5E,YAAqB,EACrB,eAAwB;IAExB,OAAO;QACL,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,EAAE;QACnC,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE;QAC1D,CAAC,gCAAgC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE;QAC1F,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,YAAY,IAAI,EAAE;QACxC,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,eAAe,IAAI,EAAE;KACrD,CAAC;AACJ,CAAC","sourcesContent":["import type { Session } from '@ms-cloudpack/api-server';\nimport { cookieNames, getCloudpackSessionVersionCookie } from './cookieNames.js';\n\n/**\n * Get the cookies that needs to be written on the page for Cloudpack to work properly.\n */\nexport function getCookies(\n  session: Pick<Session, 'id' | 'sequence' | 'projectName' | 'sessionVersion'>,\n  apiServerUrl?: string,\n  bundleServerUrl?: string,\n): Record<string, string> {\n  return {\n    [cookieNames.sessionId]: session.id,\n    [cookieNames.sessionSequence]: session.sequence.toString(),\n    [getCloudpackSessionVersionCookie(session.projectName)]: session.sessionVersion.toString(),\n    [cookieNames.apiUrl]: apiServerUrl ?? '',\n    [cookieNames.bundleServerUrl]: bundleServerUrl ?? '',\n  };\n}\n"]}