@ms-cloudpack/api-server 0.43.0 → 0.44.1

package/lib/apis/addPackageOverride.js

@@ -30,7 +30,7 @@ export async function addPackageOverride(params) {
     if (entry) {
         taskRunner.remove(entry.path);
         session.incrementTargetVersion(entry.path);
-        notifyReload({ bus });
+        notifyReload({ bus, session });
     }
     return addedOverride;
 }

package/lib/apis/addPackageOverride.js.map

@@ -1 +1 @@
-{"version":3,"file":"addPackageOverride.js","sourceRoot":"","sources":["../../src/apis/addPackageOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C;;OAEG;IACH,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;IAEvB;;OAEG;IACH,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IAEtB;;OAEG;IACH,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAE9B;;OAEG;IACH,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAGH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAyF;IAEzF,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IAEnD,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjF,IAAI,KAAK,EAAE,CAAC;QACV,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,CAAC,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,kBAAkB,CAAC,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { publicProcedure } from '../trpc/common.js';\nimport { addOverride } from '../utilities/addOverride.js';\nimport { notifyReload } from '../utilities/notifyReload.js';\nimport type { ApiParams } from '../types/ApiParams.js';\n\nconst ZodAddPackageOverrideInput = z.object({\n  /**\n   * The package name to override.\n   */\n  packageName: z.string(),\n\n  /**\n   * The import path to add for the package.\n   */\n  importPath: z.string(),\n\n  /**\n   * The version of the package to override.\n   */\n  version: z.string().optional(),\n\n  /**\n   * URL that issued the import.\n   */\n  issuerUrl: z.string().optional(),\n});\nexport type AddPackageOverrideInput = z.infer<typeof ZodAddPackageOverrideInput>;\n\n/**\n * Adds an override to the Cloudpack config.\n */\nexport async function addPackageOverride(\n  params: ApiParams<AddPackageOverrideInput, 'session' | 'bus' | 'packages' | 'taskRunner'>,\n): Promise<boolean> {\n  const { input, ctx } = params;\n  const { session, bus, packages, taskRunner } = ctx;\n\n  const { addedOverride, entry } = await addOverride(input, { session, packages });\n  if (entry) {\n    taskRunner.remove(entry.path);\n    session.incrementTargetVersion(entry.path);\n    notifyReload({ bus });\n  }\n  return addedOverride;\n}\n\naddPackageOverride.procedure = publicProcedure.input(ZodAddPackageOverrideInput).mutation(addPackageOverride);\n"]}
+{"version":3,"file":"addPackageOverride.js","sourceRoot":"","sources":["../../src/apis/addPackageOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C;;OAEG;IACH,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;IAEvB;;OAEG;IACH,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IAEtB;;OAEG;IACH,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAE9B;;OAEG;IACH,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAGH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAyF;IAEzF,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IAEnD,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IACjF,IAAI,KAAK,EAAE,CAAC;QACV,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,CAAC,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,YAAY,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,kBAAkB,CAAC,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { publicProcedure } from '../trpc/common.js';\nimport { addOverride } from '../utilities/addOverride.js';\nimport { notifyReload } from '../utilities/notifyReload.js';\nimport type { ApiParams } from '../types/ApiParams.js';\n\nconst ZodAddPackageOverrideInput = z.object({\n  /**\n   * The package name to override.\n   */\n  packageName: z.string(),\n\n  /**\n   * The import path to add for the package.\n   */\n  importPath: z.string(),\n\n  /**\n   * The version of the package to override.\n   */\n  version: z.string().optional(),\n\n  /**\n   * URL that issued the import.\n   */\n  issuerUrl: z.string().optional(),\n});\nexport type AddPackageOverrideInput = z.infer<typeof ZodAddPackageOverrideInput>;\n\n/**\n * Adds an override to the Cloudpack config.\n */\nexport async function addPackageOverride(\n  params: ApiParams<AddPackageOverrideInput, 'session' | 'bus' | 'packages' | 'taskRunner'>,\n): Promise<boolean> {\n  const { input, ctx } = params;\n  const { session, bus, packages, taskRunner } = ctx;\n\n  const { addedOverride, entry } = await addOverride(input, { session, packages });\n  if (entry) {\n    taskRunner.remove(entry.path);\n    session.incrementTargetVersion(entry.path);\n    notifyReload({ bus, session });\n  }\n  return addedOverride;\n}\n\naddPackageOverride.procedure = publicProcedure.input(ZodAddPackageOverrideInput).mutation(addPackageOverride);\n"]}

package/lib/apis/restartAllTasks.js

@@ -13,7 +13,7 @@ export async function restartAllTasks(params) {
     taskRunner.clear();
     // Update session version.
     session.incrementSessionVersion();
-    notifyReload({ bus });
+    notifyReload({ bus, session });
 }
 restartAllTasks.procedure = publicProcedure.mutation(restartAllTasks);
 //# sourceMappingURL=restartAllTasks.js.map

package/lib/apis/restartAllTasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"restartAllTasks.js","sourceRoot":"","sources":["../../src/apis/restartAllTasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,MAAyD;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IAEzC,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAEjD,4BAA4B;IAC5B,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;IAE/B,6CAA6C;IAC7C,gDAAgD;IAChD,UAAU,CAAC,KAAK,EAAE,CAAC;IAEnB,0BAA0B;IAC1B,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAElC,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AACxB,CAAC;AAED,eAAe,CAAC,SAAS,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC","sourcesContent":["import { emptyDir } from 'fs-extra/esm';\nimport { publicProcedure } from '../trpc/common.js';\nimport { getCachePath } from '../utilities/getCachePath.js';\nimport { notifyReload } from '../utilities/notifyReload.js';\nimport type { ApiParams } from '../types/ApiParams.js';\n\nexport async function restartAllTasks(params: ApiParams<void, 'session' | 'bus' | 'taskRunner'>) {\n  const { ctx } = params;\n  const { session, bus, taskRunner } = ctx;\n\n  console.debug('ApiServer: Restarting all tasks');\n\n  // Clear entire local cache.\n  await emptyDir(getCachePath());\n\n  // All tasks can be removed as notifyReload()\n  // will cause the client to add the tasks again.\n  taskRunner.clear();\n\n  // Update session version.\n  session.incrementSessionVersion();\n\n  notifyReload({ bus });\n}\n\nrestartAllTasks.procedure = publicProcedure.mutation(restartAllTasks);\n"]}
+{"version":3,"file":"restartAllTasks.js","sourceRoot":"","sources":["../../src/apis/restartAllTasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,MAAyD;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IAEzC,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAEjD,4BAA4B;IAC5B,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;IAE/B,6CAA6C;IAC7C,gDAAgD;IAChD,UAAU,CAAC,KAAK,EAAE,CAAC;IAEnB,0BAA0B;IAC1B,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAElC,YAAY,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,eAAe,CAAC,SAAS,GAAG,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC","sourcesContent":["import { emptyDir } from 'fs-extra/esm';\nimport { publicProcedure } from '../trpc/common.js';\nimport { getCachePath } from '../utilities/getCachePath.js';\nimport { notifyReload } from '../utilities/notifyReload.js';\nimport type { ApiParams } from '../types/ApiParams.js';\n\nexport async function restartAllTasks(params: ApiParams<void, 'session' | 'bus' | 'taskRunner'>) {\n  const { ctx } = params;\n  const { session, bus, taskRunner } = ctx;\n\n  console.debug('ApiServer: Restarting all tasks');\n\n  // Clear entire local cache.\n  await emptyDir(getCachePath());\n\n  // All tasks can be removed as notifyReload()\n  // will cause the client to add the tasks again.\n  taskRunner.clear();\n\n  // Update session version.\n  session.incrementSessionVersion();\n\n  notifyReload({ bus, session });\n}\n\nrestartAllTasks.procedure = publicProcedure.mutation(restartAllTasks);\n"]}

package/lib/apis/restartTask.js

@@ -12,7 +12,7 @@ export function restartTask(params) {
     console.debug(`ApiServer: Restarting task ${id}`);
     taskRunner.remove(id);
     session.incrementTargetVersion(inputPath);
-    notifyReload({ bus });
+    notifyReload({ bus, session });
 }
 // Attach a trpc procedure to the function.
 restartTask.procedure = publicProcedure.input(ZodRestartTaskInput).mutation(restartTask);

package/lib/apis/restartTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"restartTask.js","sourceRoot":"","sources":["../../src/apis/restartTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC,CAAC;AAGH,MAAM,UAAU,WAAW,CAAC,MAAqE;IAC/F,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAChC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IACzC,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;IAClD,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtB,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC1C,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AACxB,CAAC;AAED,2CAA2C;AAC3C,WAAW,CAAC,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { publicProcedure } from '../trpc/common.js';\nimport { notifyReload } from '../utilities/notifyReload.js';\nimport type { ApiParams } from '../types/ApiParams.js';\n\nconst ZodRestartTaskInput = z.object({\n  id: z.string(),\n  inputPath: z.string(),\n});\nexport type RestartTaskInput = z.infer<typeof ZodRestartTaskInput>;\n\nexport function restartTask(params: ApiParams<RestartTaskInput, 'session' | 'bus' | 'taskRunner'>) {\n  const { input, ctx } = params;\n  const { id, inputPath } = input;\n  const { session, bus, taskRunner } = ctx;\n  console.debug(`ApiServer: Restarting task ${id}`);\n  taskRunner.remove(id);\n  session.incrementTargetVersion(inputPath);\n  notifyReload({ bus });\n}\n\n// Attach a trpc procedure to the function.\nrestartTask.procedure = publicProcedure.input(ZodRestartTaskInput).mutation(restartTask);\n"]}
+{"version":3,"file":"restartTask.js","sourceRoot":"","sources":["../../src/apis/restartTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC,CAAC;AAGH,MAAM,UAAU,WAAW,CAAC,MAAqE;IAC/F,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAChC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IACzC,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;IAClD,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtB,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC1C,YAAY,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,2CAA2C;AAC3C,WAAW,CAAC,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { publicProcedure } from '../trpc/common.js';\nimport { notifyReload } from '../utilities/notifyReload.js';\nimport type { ApiParams } from '../types/ApiParams.js';\n\nconst ZodRestartTaskInput = z.object({\n  id: z.string(),\n  inputPath: z.string(),\n});\nexport type RestartTaskInput = z.infer<typeof ZodRestartTaskInput>;\n\nexport function restartTask(params: ApiParams<RestartTaskInput, 'session' | 'bus' | 'taskRunner'>) {\n  const { input, ctx } = params;\n  const { id, inputPath } = input;\n  const { session, bus, taskRunner } = ctx;\n  console.debug(`ApiServer: Restarting task ${id}`);\n  taskRunner.remove(id);\n  session.incrementTargetVersion(inputPath);\n  notifyReload({ bus, session });\n}\n\n// Attach a trpc procedure to the function.\nrestartTask.procedure = publicProcedure.input(ZodRestartTaskInput).mutation(restartTask);\n"]}

package/lib/index.browser.d.ts

@@ -1,10 +1,13 @@
 export type { TaskStats } from './types/TaskStats.js';
 export type { TaskDescription } from './types/TaskDescription.js';
 export type { TaskMessage } from './types/TaskMessage.js';
+export type { TaskList } from './types/TaskList.js';
 export type { AddPackageOverrideInput } from './apis/addPackageOverride.js';
 export type { OpenCodeEditorInput } from './apis/openCodeEditor.js';
 export type { OpenFilePathInput } from './apis/openFilePath.js';
 export type { ReportMetricInput } from './apis/reportMetric.js';
 export type { ValidatePackageOverrideInput, ValidatePackageOverrideOutput } from './apis/validatePackageOverride.js';
-export { taskListSource, taskStatsSource } from './data/busSources.js';
+export type { RestartTaskInput } from './apis/restartTask.js';
+export { createCloudpackClient, type CloudpackClient } from './trpc/createCloudpackClient.js';
+export { taskListSource, taskStatsSource, reloadCountSource } from './data/busSources.js';
 //# sourceMappingURL=index.browser.d.ts.map

package/lib/index.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../src/index.browser.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,YAAY,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,YAAY,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAErH,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../src/index.browser.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,YAAY,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,YAAY,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACrH,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAE9F,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC"}

package/lib/index.browser.js

@@ -1,2 +1,3 @@
-export { taskListSource, taskStatsSource } from './data/busSources.js';
+export { createCloudpackClient } from './trpc/createCloudpackClient.js';
+export { taskListSource, taskStatsSource, reloadCountSource } from './data/busSources.js';
 //# sourceMappingURL=index.browser.js.map

package/lib/index.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.js","sourceRoot":"","sources":["../src/index.browser.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["export type { TaskStats } from './types/TaskStats.js';\nexport type { TaskDescription } from './types/TaskDescription.js';\nexport type { TaskMessage } from './types/TaskMessage.js';\n\nexport type { AddPackageOverrideInput } from './apis/addPackageOverride.js';\nexport type { OpenCodeEditorInput } from './apis/openCodeEditor.js';\nexport type { OpenFilePathInput } from './apis/openFilePath.js';\nexport type { ReportMetricInput } from './apis/reportMetric.js';\nexport type { ValidatePackageOverrideInput, ValidatePackageOverrideOutput } from './apis/validatePackageOverride.js';\n\nexport { taskListSource, taskStatsSource } from './data/busSources.js';\n"]}
+{"version":3,"file":"index.browser.js","sourceRoot":"","sources":["../src/index.browser.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,qBAAqB,EAAwB,MAAM,iCAAiC,CAAC;AAE9F,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC","sourcesContent":["export type { TaskStats } from './types/TaskStats.js';\nexport type { TaskDescription } from './types/TaskDescription.js';\nexport type { TaskMessage } from './types/TaskMessage.js';\nexport type { TaskList } from './types/TaskList.js';\n\nexport type { AddPackageOverrideInput } from './apis/addPackageOverride.js';\nexport type { OpenCodeEditorInput } from './apis/openCodeEditor.js';\nexport type { OpenFilePathInput } from './apis/openFilePath.js';\nexport type { ReportMetricInput } from './apis/reportMetric.js';\nexport type { ValidatePackageOverrideInput, ValidatePackageOverrideOutput } from './apis/validatePackageOverride.js';\nexport type { RestartTaskInput } from './apis/restartTask.js';\n\nexport { createCloudpackClient, type CloudpackClient } from './trpc/createCloudpackClient.js';\n\nexport { taskListSource, taskStatsSource, reloadCountSource } from './data/busSources.js';\n"]}

package/lib/index.d.ts

@@ -22,7 +22,6 @@ export type { BundleTaskOptions } from './types/BundleTaskOptions.js';
 export type { OverrideOptions } from './types/OverrideOptions.js';
 export { TaskRunner } from './utilities/TaskRunner.js';
 export { reloadCountSource, taskListSource, taskStatsSource } from './data/busSources.js';
-export { startApiServer } from './startApiServer.js';
 export { createCloudpackClient } from './trpc/createCloudpackClient.js';
 export { createCloudpackServer } from './trpc/createCloudpackServer.js';
 export { ZodTaskDescription } from './types/TaskDescription.js';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,YAAY,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGvE,YAAY,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,YAAY,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACrH,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI9D,YAAY,EACV,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,gCAAgC,CAAC;AACxC,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,EACP,YAAY,EACZ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,uBAAuB,GACxB,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,YAAY,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,YAAY,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGvE,YAAY,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,YAAY,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,YAAY,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AACrH,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI9D,YAAY,EACV,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,gCAAgC,CAAC;AACxC,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,EACP,YAAY,EACZ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,uBAAuB,GACxB,MAAM,iBAAiB,CAAC"}

package/lib/index.js

@@ -1,6 +1,5 @@
 export { TaskRunner } from './utilities/TaskRunner.js';
 export { reloadCountSource, taskListSource, taskStatsSource } from './data/busSources.js';
-export { startApiServer } from './startApiServer.js';
 export { createCloudpackClient } from './trpc/createCloudpackClient.js';
 export { createCloudpackServer } from './trpc/createCloudpackServer.js';
 export { ZodTaskDescription } from './types/TaskDescription.js';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,YAAY;AACZ,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,cAAc;AACd,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,EACP,YAAY,EACZ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,uBAAuB,GACxB,MAAM,iBAAiB,CAAC","sourcesContent":["export type { ApiServer } from './types/ApiServer.js';\nexport type { Context, PartialContext } from './types/Context.js';\nexport type { BundleInfo } from './types/BundleInfo.js';\nexport type { Session } from './types/Session.js';\nexport type { TaskStats } from './types/TaskStats.js';\nexport type { Task } from './types/Task.js';\nexport type { TaskDescription } from './types/TaskDescription.js';\nexport type { TaskEndDescription } from './types/TaskEndDescription.js';\nexport type { TaskMessage } from './types/TaskMessage.js';\nexport type { TaskOptions } from './types/TaskOptions.js';\nexport type { TaskStartDescription } from './types/TaskStartDescription.js';\nexport type { CloudpackServer } from './trpc/createCloudpackServer.js';\n\n// API types\nexport type { AddPackageOverrideInput } from './apis/addPackageOverride.js';\nexport type { OpenCodeEditorInput } from './apis/openCodeEditor.js';\nexport type { OpenFilePathInput } from './apis/openFilePath.js';\nexport type { ReportMetricInput } from './apis/reportMetric.js';\nexport type { ValidatePackageOverrideInput, ValidatePackageOverrideOutput } from './apis/validatePackageOverride.js';\nexport type { RestartTaskInput } from './apis/restartTask.js';\n\n// TODO: delete these type exports once API reporting of \"forgotten\" exports is enabled\n// (they're not used and don't really need to be visible in the API)\nexport type {\n  EnsurePackageBundledContext,\n  EnsurePackageBundledInput,\n  EnsurePackageBundledOutput,\n  EnsurePackageBundledResult,\n} from './apis/ensurePackageBundled.js';\nexport type { BundleRequest } from './types/BundleRequest.js';\nexport type { BundleTaskOptions } from './types/BundleTaskOptions.js';\nexport type { OverrideOptions } from './types/OverrideOptions.js';\n\nexport { TaskRunner } from './utilities/TaskRunner.js';\nexport { reloadCountSource, taskListSource, taskStatsSource } from './data/busSources.js';\nexport { startApiServer } from './startApiServer.js';\nexport { createCloudpackClient } from './trpc/createCloudpackClient.js';\nexport { createCloudpackServer } from './trpc/createCloudpackServer.js';\nexport { ZodTaskDescription } from './types/TaskDescription.js';\nexport { ZodTaskEndDescription } from './types/TaskEndDescription.js';\nexport { ZodTaskMessage } from './types/TaskMessage.js';\nexport { ZodTaskStartDescription } from './types/TaskStartDescription.js';\nexport { getCachePath, getLocalCachePath } from './utilities/getCachePath.js';\nexport { getSessionPath } from './utilities/getSessionPath.js';\nexport { getConsumedDependencies } from './utilities/getConsumedDependencies.js';\nexport { getConsumedPaths } from './utilities/getConsumedPaths.js';\n\n// Utilities\nexport { createPartialApiContext } from './common/createPartialApiContext.js';\n\n// API methods\nexport {\n  addPackageOverride,\n  ensurePackageBundled,\n  getData,\n  getSessionId,\n  onDataChanged,\n  openCodeEditor,\n  openConfigEditor,\n  openFilePath,\n  reportMetric,\n  syncDownload,\n  syncUpload,\n  validatePackageOverride,\n} from './apis/index.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,YAAY;AACZ,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,cAAc;AACd,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,EACP,YAAY,EACZ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,uBAAuB,GACxB,MAAM,iBAAiB,CAAC","sourcesContent":["export type { ApiServer } from './types/ApiServer.js';\nexport type { Context, PartialContext } from './types/Context.js';\nexport type { BundleInfo } from './types/BundleInfo.js';\nexport type { Session } from './types/Session.js';\nexport type { TaskStats } from './types/TaskStats.js';\nexport type { Task } from './types/Task.js';\nexport type { TaskDescription } from './types/TaskDescription.js';\nexport type { TaskEndDescription } from './types/TaskEndDescription.js';\nexport type { TaskMessage } from './types/TaskMessage.js';\nexport type { TaskOptions } from './types/TaskOptions.js';\nexport type { TaskStartDescription } from './types/TaskStartDescription.js';\nexport type { CloudpackServer } from './trpc/createCloudpackServer.js';\n\n// API types\nexport type { AddPackageOverrideInput } from './apis/addPackageOverride.js';\nexport type { OpenCodeEditorInput } from './apis/openCodeEditor.js';\nexport type { OpenFilePathInput } from './apis/openFilePath.js';\nexport type { ReportMetricInput } from './apis/reportMetric.js';\nexport type { ValidatePackageOverrideInput, ValidatePackageOverrideOutput } from './apis/validatePackageOverride.js';\nexport type { RestartTaskInput } from './apis/restartTask.js';\n\n// TODO: delete these type exports once API reporting of \"forgotten\" exports is enabled\n// (they're not used and don't really need to be visible in the API)\nexport type {\n  EnsurePackageBundledContext,\n  EnsurePackageBundledInput,\n  EnsurePackageBundledOutput,\n  EnsurePackageBundledResult,\n} from './apis/ensurePackageBundled.js';\nexport type { BundleRequest } from './types/BundleRequest.js';\nexport type { BundleTaskOptions } from './types/BundleTaskOptions.js';\nexport type { OverrideOptions } from './types/OverrideOptions.js';\n\nexport { TaskRunner } from './utilities/TaskRunner.js';\nexport { reloadCountSource, taskListSource, taskStatsSource } from './data/busSources.js';\nexport { createCloudpackClient } from './trpc/createCloudpackClient.js';\nexport { createCloudpackServer } from './trpc/createCloudpackServer.js';\nexport { ZodTaskDescription } from './types/TaskDescription.js';\nexport { ZodTaskEndDescription } from './types/TaskEndDescription.js';\nexport { ZodTaskMessage } from './types/TaskMessage.js';\nexport { ZodTaskStartDescription } from './types/TaskStartDescription.js';\nexport { getCachePath, getLocalCachePath } from './utilities/getCachePath.js';\nexport { getSessionPath } from './utilities/getSessionPath.js';\nexport { getConsumedDependencies } from './utilities/getConsumedDependencies.js';\nexport { getConsumedPaths } from './utilities/getConsumedPaths.js';\n\n// Utilities\nexport { createPartialApiContext } from './common/createPartialApiContext.js';\n\n// API methods\nexport {\n  addPackageOverride,\n  ensurePackageBundled,\n  getData,\n  getSessionId,\n  onDataChanged,\n  openCodeEditor,\n  openConfigEditor,\n  openFilePath,\n  reportMetric,\n  syncDownload,\n  syncUpload,\n  validatePackageOverride,\n} from './apis/index.js';\n"]}

package/lib/trpc/createCloudpackClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCloudpackClient.d.ts","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG,qBAAqB,CAAC,SAAS,CAAC,GAAG;IAC/D,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACnD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,GAAG,OAAO,CAAC,eAAe,CAAC,CAwD3B"}
+{"version":3,"file":"createCloudpackClient.d.ts","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAI1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG,qBAAqB,CAAC,SAAS,CAAC,GAAG;IAC/D,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACnD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,GAAG,OAAO,CAAC,eAAe,CAAC,CAiD3B"}

package/lib/trpc/createCloudpackClient.js

@@ -1,9 +1,7 @@
-import { createDataBus } from '@ms-cloudpack/data-bus';
 import { makeUrl } from '@ms-cloudpack/path-string-parsing';
 import { createTRPCProxyClient, createWSClient, httpBatchLink, splitLink, wsLink } from '@trpc/client';
 import { ensureWebsocketDefined } from '../utilities/ensureWebsocketDefined.js';
 import { ignoreSelfSignedCertErrors } from '../utilities/ignoreSelfSignedCertErrors.js';
-import { connectBusToClient } from './connectBusToClient.js';
 export async function createCloudpackClient(options) {
     // We polyfill websocket in node conditions.
     await ensureWebsocketDefined();
@@ -30,15 +28,10 @@ export async function createCloudpackClient(options) {
             }),
         ],
     });
-    // Connect the bus to the client so that local requests are sent remotely.
-    const bus = createDataBus();
-    connectBusToClient({ bus, client });
     // Ugh. This is a hack to get around the fact that the client is a proxy.
     return new Proxy({
-        bus,
         close: () => {
             wsClient.close();
-            bus.dispose();
         },
     }, {
         get(target, prop) {

package/lib/trpc/createCloudpackClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"createCloudpackClient.js","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAQ7D,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAG3C;IACC,4CAA4C;IAC5C,MAAM,sBAAsB,EAAE,CAAC;IAE/B,0BAA0B,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE3D,qBAAqB;IACrB,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAErC,oFAAoF;IACpF,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC;IAC1C,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAE9C,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,qBAAqB,CAAY;QAC9C,KAAK,EAAE;YACL,SAAS,CAAC;gBACR,SAAS,CAAC,EAAE;oBACV,OAAO,EAAE,CAAC,IAAI,KAAK,cAAc,CAAC;gBACpC,CAAC;gBACD,IAAI,EAAE,MAAM,CAAC;oBACX,MAAM,EAAE,QAAQ;iBACjB,CAAC;gBACF,KAAK,EAAE,aAAa,CAAC;oBACnB,GAAG;iBACJ,CAAC;aACH,CAAC;SACH;KACF,CAA+B,CAAC;IAEjC,0EAA0E;IAC1E,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAE5B,kBAAkB,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;IAEpC,yEAAyE;IACzE,OAAO,IAAI,KAAK,CACd;QACE,GAAG;QACH,KAAK,EAAE,GAAG,EAAE;YACV,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC;KACF,EACD;QACE,GAAG,CAAC,MAAM,EAAE,IAAI;YACd,iDAAiD;YACjD,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC,IAA2B,CAAC,CAAC;YAC7C,CAAC;YAED,OAAO,MAAM,CAAC,IAA6B,CAAC,CAAC;QAC/C,CAAC;KACF,CACiB,CAAC;AACvB,CAAC","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport { createDataBus } from '@ms-cloudpack/data-bus';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { CreateTRPCProxyClient } from '@trpc/client';\nimport { createTRPCProxyClient, createWSClient, httpBatchLink, splitLink, wsLink } from '@trpc/client';\nimport { ensureWebsocketDefined } from '../utilities/ensureWebsocketDefined.js';\nimport { ignoreSelfSignedCertErrors } from '../utilities/ignoreSelfSignedCertErrors.js';\nimport { connectBusToClient } from './connectBusToClient.js';\nimport type { AppRouter } from './createAppRouter.js';\n\nexport type CloudpackClient = CreateTRPCProxyClient<AppRouter> & {\n  bus: DataBus;\n  close: () => Promise<void>;\n};\n\nexport async function createCloudpackClient(options: {\n  url: string;\n  reporter?: TaskReporter;\n}): Promise<CloudpackClient> {\n  // We polyfill websocket in node conditions.\n  await ensureWebsocketDefined();\n\n  ignoreSelfSignedCertErrors({ reporter: options.reporter });\n\n  // Create the client.\n  const wsClient = createWSClient(options);\n  const tempUrl = makeUrl(options.url);\n\n  // Replace the protocol with http so that we can use the same url for http requests.\n  const isSSL = tempUrl.protocol === 'wss:';\n  tempUrl.protocol = isSSL ? 'https:' : 'http:';\n\n  const url = tempUrl.toString().replace(/\\/$/, '');\n  const client = createTRPCProxyClient<AppRouter>({\n    links: [\n      splitLink({\n        condition(op) {\n          return op.type === 'subscription';\n        },\n        true: wsLink({\n          client: wsClient,\n        }),\n        false: httpBatchLink({\n          url,\n        }),\n      }),\n    ],\n  }) as unknown as CloudpackClient;\n\n  // Connect the bus to the client so that local requests are sent remotely.\n  const bus = createDataBus();\n\n  connectBusToClient({ bus, client });\n\n  // Ugh. This is a hack to get around the fact that the client is a proxy.\n  return new Proxy(\n    {\n      bus,\n      close: () => {\n        wsClient.close();\n        bus.dispose();\n      },\n    },\n    {\n      get(target, prop) {\n        // eslint-disable-next-line no-prototype-builtins\n        if (target.hasOwnProperty(prop)) {\n          return target[prop as keyof typeof target];\n        }\n\n        return client[prop as keyof CloudpackClient];\n      },\n    },\n  ) as CloudpackClient;\n}\n"]}
+{"version":3,"file":"createCloudpackClient.js","sourceRoot":"","sources":["../../src/trpc/createCloudpackClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAQxF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAG3C;IACC,4CAA4C;IAC5C,MAAM,sBAAsB,EAAE,CAAC;IAE/B,0BAA0B,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE3D,qBAAqB;IACrB,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAErC,oFAAoF;IACpF,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC;IAC1C,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAE9C,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,qBAAqB,CAAY;QAC9C,KAAK,EAAE;YACL,SAAS,CAAC;gBACR,SAAS,CAAC,EAAE;oBACV,OAAO,EAAE,CAAC,IAAI,KAAK,cAAc,CAAC;gBACpC,CAAC;gBACD,IAAI,EAAE,MAAM,CAAC;oBACX,MAAM,EAAE,QAAQ;iBACjB,CAAC;gBACF,KAAK,EAAE,aAAa,CAAC;oBACnB,GAAG;iBACJ,CAAC;aACH,CAAC;SACH;KACF,CAA+B,CAAC;IAEjC,yEAAyE;IACzE,OAAO,IAAI,KAAK,CACd;QACE,KAAK,EAAE,GAAG,EAAE;YACV,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;KACF,EACD;QACE,GAAG,CAAC,MAAM,EAAE,IAAI;YACd,iDAAiD;YACjD,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC,IAA2B,CAAC,CAAC;YAC7C,CAAC;YAED,OAAO,MAAM,CAAC,IAA6B,CAAC,CAAC;QAC/C,CAAC;KACF,CACiB,CAAC;AACvB,CAAC","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { CreateTRPCProxyClient } from '@trpc/client';\nimport { createTRPCProxyClient, createWSClient, httpBatchLink, splitLink, wsLink } from '@trpc/client';\nimport { ensureWebsocketDefined } from '../utilities/ensureWebsocketDefined.js';\nimport { ignoreSelfSignedCertErrors } from '../utilities/ignoreSelfSignedCertErrors.js';\nimport type { AppRouter } from './createAppRouter.js';\n\nexport type CloudpackClient = CreateTRPCProxyClient<AppRouter> & {\n  bus: DataBus;\n  close: () => Promise<void>;\n};\n\nexport async function createCloudpackClient(options: {\n  url: string;\n  reporter?: TaskReporter;\n}): Promise<CloudpackClient> {\n  // We polyfill websocket in node conditions.\n  await ensureWebsocketDefined();\n\n  ignoreSelfSignedCertErrors({ reporter: options.reporter });\n\n  // Create the client.\n  const wsClient = createWSClient(options);\n  const tempUrl = makeUrl(options.url);\n\n  // Replace the protocol with http so that we can use the same url for http requests.\n  const isSSL = tempUrl.protocol === 'wss:';\n  tempUrl.protocol = isSSL ? 'https:' : 'http:';\n\n  const url = tempUrl.toString().replace(/\\/$/, '');\n  const client = createTRPCProxyClient<AppRouter>({\n    links: [\n      splitLink({\n        condition(op) {\n          return op.type === 'subscription';\n        },\n        true: wsLink({\n          client: wsClient,\n        }),\n        false: httpBatchLink({\n          url,\n        }),\n      }),\n    ],\n  }) as unknown as CloudpackClient;\n\n  // Ugh. This is a hack to get around the fact that the client is a proxy.\n  return new Proxy(\n    {\n      close: () => {\n        wsClient.close();\n      },\n    },\n    {\n      get(target, prop) {\n        // eslint-disable-next-line no-prototype-builtins\n        if (target.hasOwnProperty(prop)) {\n          return target[prop as keyof typeof target];\n        }\n\n        return client[prop as keyof CloudpackClient];\n      },\n    },\n  ) as CloudpackClient;\n}\n"]}

package/lib/trpc/createCloudpackServer.d.ts

@@ -1,20 +1,7 @@
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
-import type { TelemetryClient } from '@ms-cloudpack/telemetry';
-import type { Session } from '../types/Session.js';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-import type { PackageImportPaths } from '@ms-cloudpack/import-map';
-import type { PackageHashes } from '@ms-cloudpack/package-hashes';
-export declare function createCloudpackServer(options: {
-    session: Session;
-    telemetryClient: TelemetryClient;
-    reporter: TaskReporter;
-    packages: PackageDefinitionsCache;
-    packageImportPaths: PackageImportPaths;
-    packageHashes: PackageHashes;
-}): Promise<{
+import type { Context } from '../types/Context.js';
+export declare function createCloudpackServer(context: Context): Promise<{
     url: string;
     port: number;
-    ctx: import("../index.js").Context;
     close: () => Promise<void>;
     addPackageOverride: (options: {
         packageName: string;

package/lib/trpc/createCloudpackServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCloudpackServer.d.ts","sourceRoot":"","sources":["../../src/trpc/createCloudpackServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAMnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACnD,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;CAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCA;AAED,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"createCloudpackServer.d.ts","sourceRoot":"","sources":["../../src/trpc/createCloudpackServer.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyC3D;AAED,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/lib/trpc/createCloudpackServer.js

@@ -6,10 +6,10 @@ import { createContextFactory } from './createContextFactory.js';
 import { createHTTPServer } from './httpAdapter.js';
 import cors from 'cors';
 import { getDomain } from '@ms-cloudpack/create-express-app';
-export async function createCloudpackServer(options) {
-    const createContext = await createContextFactory(options);
-    const hostname = getDomain(options.session.config?.devServer?.domain);
-    const https = options.session.config?.devServer?.https;
+export async function createCloudpackServer(context) {
+    const createContext = await createContextFactory(context);
+    const hostname = getDomain(context.session.config?.devServer?.domain);
+    const https = context.session.config?.devServer?.https;
     const port = await getPort({ port: [9890, 9891, 9892, 9893] });
     const { router, apis } = createAppRouter();
     const { server, listen } = createHTTPServer({
@@ -28,15 +28,18 @@ export async function createCloudpackServer(options) {
     listen(port, hostname);
     const localCallContext = await createContext();
     const apisWithContext = withContext(apis, localCallContext);
+    const url = `${webSocketProtocol}://${hostname}:${port}`;
+    context.session.urls.apiServer = url;
     return {
         ...apisWithContext,
-        url: `${webSocketProtocol}://${hostname}:${port}`,
+        url,
         port,
-        ctx: localCallContext,
         close: async () => {
-            await localCallContext.dispose();
-            server.close();
-            wss.close();
+            await new Promise((resolve, reject) => {
+                wss.clients.forEach((socket) => socket.terminate());
+                wss.close((err) => (err ? reject(err) : resolve()));
+                server.close();
+            });
         },
     };
 }

package/lib/trpc/createCloudpackServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"createCloudpackServer.js","sourceRoot":"","sources":["../../src/trpc/createCloudpackServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAErC,OAAO,EAAE,eAAe,EAAkB,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAK7D,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAO3C;IACC,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC;IACvD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,EAAE,CAAC;IAC3C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC;QAC1C,UAAU,EAAE,IAAI,EAAE;QAClB,MAAM;QACN,aAAa;QACb,KAAK;KACN,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE5C,eAAe,CAAY;QACzB,GAAG;QACH,MAAM;QACN,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEvB,MAAM,gBAAgB,GAAG,MAAM,aAAa,EAAE,CAAC;IAC/C,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAE5D,OAAO;QACL,GAAG,eAAe;QAClB,GAAG,EAAE,GAAG,iBAAiB,MAAM,QAAQ,IAAI,IAAI,EAAE;QACjD,IAAI;QACJ,GAAG,EAAE,gBAAgB;QAErB,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC;AAID,8FAA8F;AAC9F,8DAA8D;AAC9D,SAAS,WAAW,CAClB,IAAW,EACX,GAAa;IAEb,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAChC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE;QAC1B,GAAG,CAAC,GAAkB,CAAC,GAAG,CAAC,KAAgD,EAAE,EAAE;QAC7E,+DAA+D;QAC/D,WAAW,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAuG,CACxG,CAAC;AACJ,CAAC","sourcesContent":["import type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport { applyWSSHandler } from '@trpc/server/adapters/ws';\nimport getPort from 'get-port';\nimport { WebSocketServer } from 'ws';\nimport type { Session } from '../types/Session.js';\nimport { createAppRouter, type AppRouter } from './createAppRouter.js';\nimport { createContextFactory } from './createContextFactory.js';\nimport { createHTTPServer } from './httpAdapter.js';\nimport cors from 'cors';\nimport { getDomain } from '@ms-cloudpack/create-express-app';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport async function createCloudpackServer(options: {\n  session: Session;\n  telemetryClient: TelemetryClient;\n  reporter: TaskReporter;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  packageHashes: PackageHashes;\n}) {\n  const createContext = await createContextFactory(options);\n  const hostname = getDomain(options.session.config?.devServer?.domain);\n  const https = options.session.config?.devServer?.https;\n  const port = await getPort({ port: [9890, 9891, 9892, 9893] });\n  const { router, apis } = createAppRouter();\n  const { server, listen } = createHTTPServer({\n    middleware: cors(),\n    router,\n    createContext,\n    https,\n  });\n  const webSocketProtocol = https ? 'wss' : 'ws';\n  const wss = new WebSocketServer({ server });\n\n  applyWSSHandler<AppRouter>({\n    wss,\n    router,\n    createContext,\n  });\n\n  listen(port, hostname);\n\n  const localCallContext = await createContext();\n  const apisWithContext = withContext(apis, localCallContext);\n\n  return {\n    ...apisWithContext,\n    url: `${webSocketProtocol}://${hostname}:${port}`,\n    port,\n    ctx: localCallContext,\n\n    close: async () => {\n      await localCallContext.dispose();\n      server.close();\n      wss.close();\n    },\n  };\n}\n\nexport type CloudpackServer = ReturnType<typeof createCloudpackServer>;\n\n/** Helper to tie the local call context with the apis so callers don't have to cache them. */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction withContext<TApis extends { [key: string]: (options: { input: any; ctx: TContext }) => any }, TContext>(\n  apis: TApis,\n  ctx: TContext,\n) {\n  return Object.entries(apis).reduce(\n    (acc, [key, apiFunction]) => {\n      acc[key as keyof TApis] = (input: Parameters<TApis[typeof key]>[0]['input']) =>\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n        apiFunction({ input, ctx });\n      return acc;\n    },\n    {} as { [key in keyof TApis]: (options: Parameters<TApis[key]>[0]['input']) => ReturnType<TApis[key]> },\n  );\n}\n"]}
+{"version":3,"file":"createCloudpackServer.js","sourceRoot":"","sources":["../../src/trpc/createCloudpackServer.ts"],"names":[],"mappings":"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","sourcesContent":["import { applyWSSHandler } from '@trpc/server/adapters/ws';\nimport getPort from 'get-port';\nimport { WebSocketServer } from 'ws';\nimport { createAppRouter, type AppRouter } from './createAppRouter.js';\nimport { createContextFactory } from './createContextFactory.js';\nimport { createHTTPServer } from './httpAdapter.js';\nimport cors from 'cors';\nimport { getDomain } from '@ms-cloudpack/create-express-app';\nimport type { Context } from '../types/Context.js';\n\nexport async function createCloudpackServer(context: Context) {\n  const createContext = await createContextFactory(context);\n  const hostname = getDomain(context.session.config?.devServer?.domain);\n  const https = context.session.config?.devServer?.https;\n  const port = await getPort({ port: [9890, 9891, 9892, 9893] });\n  const { router, apis } = createAppRouter();\n  const { server, listen } = createHTTPServer({\n    middleware: cors(),\n    router,\n    createContext,\n    https,\n  });\n  const webSocketProtocol = https ? 'wss' : 'ws';\n  const wss = new WebSocketServer({ server });\n\n  applyWSSHandler<AppRouter>({\n    wss,\n    router,\n    createContext,\n  });\n\n  listen(port, hostname);\n\n  const localCallContext = await createContext();\n  const apisWithContext = withContext(apis, localCallContext);\n  const url = `${webSocketProtocol}://${hostname}:${port}`;\n  context.session.urls.apiServer = url;\n\n  return {\n    ...apisWithContext,\n    url,\n    port,\n\n    close: async () => {\n      await new Promise<void>((resolve, reject) => {\n        wss.clients.forEach((socket) => socket.terminate());\n        wss.close((err) => (err ? reject(err) : resolve()));\n        server.close();\n      });\n    },\n  };\n}\n\nexport type CloudpackServer = ReturnType<typeof createCloudpackServer>;\n\n/** Helper to tie the local call context with the apis so callers don't have to cache them. */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction withContext<TApis extends { [key: string]: (options: { input: any; ctx: TContext }) => any }, TContext>(\n  apis: TApis,\n  ctx: TContext,\n) {\n  return Object.entries(apis).reduce(\n    (acc, [key, apiFunction]) => {\n      acc[key as keyof TApis] = (input: Parameters<TApis[typeof key]>[0]['input']) =>\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n        apiFunction({ input, ctx });\n      return acc;\n    },\n    {} as { [key in keyof TApis]: (options: Parameters<TApis[key]>[0]['input']) => ReturnType<TApis[key]> },\n  );\n}\n"]}

package/lib/trpc/createContextFactory.d.ts

@@ -1,22 +1,9 @@
-import type { TaskReporter } from '@ms-cloudpack/task-reporter';
-import type { TelemetryClient } from '@ms-cloudpack/telemetry';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
 import type { Context } from '../types/Context.js';
-import type { Session } from '../types/Session.js';
-import type { PackageImportPaths } from '@ms-cloudpack/import-map';
-import type { PackageHashes } from '@ms-cloudpack/package-hashes';
 export type CreateContext = () => Promise<Context>;
 /**
  * Creates the server context and returns a connection context factory.
  * The context object is accessible to apis and serves as a way to share stateful
  * objects across them.
  */
-export declare function createContextFactory(options: {
-    session: Session;
-    reporter: TaskReporter;
-    telemetryClient: TelemetryClient;
-    packages: PackageDefinitionsCache;
-    packageImportPaths: PackageImportPaths;
-    packageHashes: PackageHashes;
-}): Promise<CreateContext>;
+export declare function createContextFactory(context: Context): Promise<CreateContext>;
 //# sourceMappingURL=createContextFactory.d.ts.map

package/lib/trpc/createContextFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createContextFactory.d.ts","sourceRoot":"","sources":["../../src/trpc/createContextFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AAEnD;;;;GAIG;AAEH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE;IAClD,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;CAC9B,0BAmDA"}
+{"version":3,"file":"createContextFactory.d.ts","sourceRoot":"","sources":["../../src/trpc/createContextFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AAEnD;;;;GAIG;AAEH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,0BAU1D"}

package/lib/trpc/createContextFactory.js

@@ -1,49 +1,16 @@
-import { createDataBus } from '@ms-cloudpack/data-bus';
-import { createWatcher } from '@ms-cloudpack/file-watcher';
-import { TaskRunner } from '../utilities/TaskRunner.js';
 /**
  * Creates the server context and returns a connection context factory.
  * The context object is accessible to apis and serves as a way to share stateful
  * objects across them.
  */
 // eslint-disable-next-line @typescript-eslint/require-await
-export async function createContextFactory(options) {
-    const { session, telemetryClient, reporter, packages, packageImportPaths, packageHashes } = options;
-    // const host = getDomain(config?.devServer?.domain);
-    // const port = await getPort({ port: [9890, 9891, 9892, 9893] });
-    // const bus = createDataBus();
-    const bus = createDataBus();
-    const watcher = createWatcher();
-    const taskRunner = new TaskRunner({ reporter, bus, session });
+export async function createContextFactory(context) {
     // Return the factory function which creates a context object per connection. This allows
     // us to choose what we expose to each client from server context, but also allows us to
     // add additional context to each connection.
     // eslint-disable-next-line @typescript-eslint/require-await
     const createContext = async () => {
-        return {
-            // session manager
-            session,
-            // data bus
-            bus,
-            // telemetry
-            telemetryClient,
-            // logging
-            reporter,
-            // file watcher
-            watcher,
-            // packages
-            packages,
-            // tasks
-            taskRunner,
-            // package import paths
-            packageImportPaths,
-            // package hashes
-            packageHashes,
-            // dispose things that the context creates.
-            async dispose() {
-                await watcher.unwatchAll();
-            },
-        };
+        return context;
     };
     return createContext;
 }

package/lib/trpc/createContextFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"createContextFactory.js","sourceRoot":"","sources":["../../src/trpc/createContextFactory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAQxD;;;;GAIG;AACH,4DAA4D;AAC5D,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAO1C;IACC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACpG,qDAAqD;IACrD,kEAAkE;IAClE,+BAA+B;IAE/B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IAE9D,yFAAyF;IACzF,wFAAwF;IACxF,6CAA6C;IAC7C,4DAA4D;IAC5D,MAAM,aAAa,GAAkB,KAAK,IAAI,EAAE;QAC9C,OAAO;YACL,kBAAkB;YAClB,OAAO;YAEP,WAAW;YACX,GAAG;YAEH,YAAY;YACZ,eAAe;YAEf,UAAU;YACV,QAAQ;YAER,eAAe;YACf,OAAO;YAEP,WAAW;YACX,QAAQ;YAER,QAAQ;YACR,UAAU;YAEV,uBAAuB;YACvB,kBAAkB;YAElB,iBAAiB;YACjB,aAAa;YAEb,2CAA2C;YAC3C,KAAK,CAAC,OAAO;gBACX,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;YAC7B,CAAC;SACF,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport { createDataBus } from '@ms-cloudpack/data-bus';\nimport { createWatcher } from '@ms-cloudpack/file-watcher';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { TaskRunner } from '../utilities/TaskRunner.js';\nimport type { Context } from '../types/Context.js';\nimport type { Session } from '../types/Session.js';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\nexport type CreateContext = () => Promise<Context>;\n\n/**\n * Creates the server context and returns a connection context factory.\n * The context object is accessible to apis and serves as a way to share stateful\n * objects across them.\n */\n// eslint-disable-next-line @typescript-eslint/require-await\nexport async function createContextFactory(options: {\n  session: Session;\n  reporter: TaskReporter;\n  telemetryClient: TelemetryClient;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  packageHashes: PackageHashes;\n}) {\n  const { session, telemetryClient, reporter, packages, packageImportPaths, packageHashes } = options;\n  // const host = getDomain(config?.devServer?.domain);\n  // const port = await getPort({ port: [9890, 9891, 9892, 9893] });\n  // const bus = createDataBus();\n\n  const bus = createDataBus();\n  const watcher = createWatcher();\n  const taskRunner = new TaskRunner({ reporter, bus, session });\n\n  // Return the factory function which creates a context object per connection. This allows\n  // us to choose what we expose to each client from server context, but also allows us to\n  // add additional context to each connection.\n  // eslint-disable-next-line @typescript-eslint/require-await\n  const createContext: CreateContext = async () => {\n    return {\n      // session manager\n      session,\n\n      // data bus\n      bus,\n\n      // telemetry\n      telemetryClient,\n\n      // logging\n      reporter,\n\n      // file watcher\n      watcher,\n\n      // packages\n      packages,\n\n      // tasks\n      taskRunner,\n\n      // package import paths\n      packageImportPaths,\n\n      // package hashes\n      packageHashes,\n\n      // dispose things that the context creates.\n      async dispose() {\n        await watcher.unwatchAll();\n      },\n    };\n  };\n\n  return createContext;\n}\n"]}
+{"version":3,"file":"createContextFactory.js","sourceRoot":"","sources":["../../src/trpc/createContextFactory.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,4DAA4D;AAC5D,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAgB;IACzD,yFAAyF;IACzF,wFAAwF;IACxF,6CAA6C;IAC7C,4DAA4D;IAC5D,MAAM,aAAa,GAAkB,KAAK,IAAI,EAAE;QAC9C,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import type { Context } from '../types/Context.js';\n\nexport type CreateContext = () => Promise<Context>;\n\n/**\n * Creates the server context and returns a connection context factory.\n * The context object is accessible to apis and serves as a way to share stateful\n * objects across them.\n */\n// eslint-disable-next-line @typescript-eslint/require-await\nexport async function createContextFactory(context: Context) {\n  // Return the factory function which creates a context object per connection. This allows\n  // us to choose what we expose to each client from server context, but also allows us to\n  // add additional context to each connection.\n  // eslint-disable-next-line @typescript-eslint/require-await\n  const createContext: CreateContext = async () => {\n    return context;\n  };\n\n  return createContext;\n}\n"]}

package/lib/utilities/TaskRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskRunner.d.ts","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAOvE;;;GAGG;AACH,qBAAa,UAAU;IAGrB,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,aAAa,CAA4B;IAEjD,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,cAAc,CAAc;IAEpC,OAAO,CAAC,UAAU,CAAyB;gBAE/B,OAAO,CAAC,EAAE,iBAAiB;IAevC;;;;;OAKG;IACH,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IA6E1E;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAaxB;;OAEG;IACH,KAAK,IAAI,IAAI;IAYb,2CAA2C;IAC3C,MAAM,IAAI,IAAI;IAId,sDAAsD;IACtD,MAAM,IAAI,IAAI;IAId;;OAEG;IACH,OAAO,CAAC,YAAY;IAmCpB;;OAEG;IACH,OAAO,CAAC,UAAU;CA6BnB"}
+{"version":3,"file":"TaskRunner.d.ts","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAOvE;;;GAGG;AACH,qBAAa,UAAU;IAGrB,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,aAAa,CAA4B;IAEjD,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,cAAc,CAAc;IAEpC,OAAO,CAAC,UAAU,CAAyB;gBAE/B,OAAO,CAAC,EAAE,iBAAiB;IAevC;;;;;OAKG;IACH,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAwE1E;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAaxB;;OAEG;IACH,KAAK,IAAI,IAAI;IAYb,2CAA2C;IAC3C,MAAM,IAAI,IAAI;IAId,sDAAsD;IACtD,MAAM,IAAI,IAAI;IAId;;OAEG;IACH,OAAO,CAAC,YAAY;IAmCpB;;OAEG;IACH,OAAO,CAAC,UAAU;CA6BnB"}

package/lib/utilities/TaskRunner.js

@@ -51,17 +51,13 @@ export class TaskRunner {
                 // Delete from rerun list (if present).
                 this._requiresRerun.delete(id);
                 taskResult = await this._queue.add(async () => {
-                    const startDescription = {
-                        ...task.getStartDescription?.(),
-                        id,
-                    };
-                    this._reportStart(id, startDescription);
+                    if (task.getStartDescription) {
+                        this._reportStart(id, task.getStartDescription());
+                    }
                     const result = await execute();
-                    const endDescription = {
-                        ...task.getEndDescription?.(result),
-                        id,
-                    };
-                    this._reportEnd(id, endDescription);
+                    if (task.getEndDescription) {
+                        this._reportEnd(id, task.getEndDescription(result));
+                    }
                     return result;
                 }, 
                 // Removes void from return type.

package/lib/utilities/TaskRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TaskStartDescription } from '../types/TaskStartDescription.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport type { TaskOptions } from '../types/TaskOptions.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskRunnerContext } from '../types/TaskRunnerContext.js';\nimport type { TaskStats } from '../types/TaskStats.js';\nimport type { TaskList } from '../types/TaskList.js';\nimport PQueue from 'p-queue';\nimport { getDefaultTaskStats } from './getDefaultTaskStats.js';\nimport { taskListSource, taskStatsSource, type TaskDescription } from '../index.browser.js';\n\n/**\n * TaskRunner class manages the state of Tasks.\n * This class is to be called by the api server.\n */\nexport class TaskRunner {\n  // Context is used to publish task status to the bus,\n  // so it is optional, as it is not needed during init or testing.\n  private _context: TaskRunnerContext | undefined;\n  private _queue: PQueue;\n  private _taskStats: TaskStats;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _pendingTasks: Map<string, Promise<any>>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _completedTasks: Map<string, any>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor(context?: TaskRunnerContext) {\n    this._context = context;\n    this._queue = new PQueue({ concurrency: 10 });\n    this._taskStats = getDefaultTaskStats();\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n\n    if (this._context) {\n      const { bus, session } = this._context;\n      bus.publish([session.id, 'status'], this._taskStats);\n    }\n  }\n\n  /**\n   * The add method enqueues a Task and returns its Promise.\n   * If a Task with the same id has already been processed,\n   * it returns either the result or the promise.\n   * Rerun flag forces the Task to be run again.\n   */\n  add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, watch, priority } = options || {};\n\n    watch?.();\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      return pending;\n    }\n\n    const resultPromise = (async () => {\n      let taskResult: TReturn | undefined;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n\n        taskResult = await this._queue.add(\n          async () => {\n            const startDescription: TaskStartDescription = {\n              ...task.getStartDescription?.(),\n              id,\n            };\n            this._reportStart(id, startDescription);\n\n            const result = await execute();\n\n            const endDescription: TaskEndDescription = {\n              ...task.getEndDescription?.(result),\n              id,\n            };\n            this._reportEnd(id, endDescription);\n\n            return result;\n          },\n          // Removes void from return type.\n          // Read more on: https://github.com/sindresorhus/p-queue/issues/175\n          { throwOnTimeout: true, priority },\n        );\n      } while (this._requiresRerun.has(id));\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n\n      // Extra check to ensure that the task returned a value.\n      // It should never throw, if it does we have a bug.\n      if (taskResult === undefined) {\n        throw new Error(`Task \"${name}:${id}\" returned undefined, without throwing an error, which was unexpected.`);\n      }\n\n      // Update finished Tasks.\n      this._completedTasks.set(id, taskResult);\n\n      return taskResult;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n\n    return resultPromise;\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intended to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        console.debug(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.clear?.();\n    this._prevTasks.delete(id);\n    this._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n  }\n  /**\n   * The clear method disposes all tasks and clears the TaskRunner.\n   */\n  clear(): void {\n    this._taskStats = getDefaultTaskStats();\n    if (this._context) {\n      const { bus, session } = this._context;\n      bus.publish([session.id, 'status'], this._taskStats);\n      bus.publish(taskListSource, { tasks: [] });\n    }\n    for (const id of this._prevTasks.keys()) {\n      this.remove(id);\n    }\n  }\n\n  /** Pauses the TaskRunner (for testing). */\n  _pause(): void {\n    this._queue.pause();\n  }\n\n  /** Starts or resumes the TaskRunner (for testing). */\n  _start(): void {\n    this._queue.start();\n  }\n\n  /**\n   * Internal method to report the start of a task to the bus.\n   */\n  private _reportStart(id: string, description: TaskStartDescription): void {\n    if (!this._context) return;\n    const { bus } = this._context;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (!previousDescription) {\n      this._taskStats.totalTasks++;\n    }\n\n    if (previousDescription?.status === 'complete') {\n      this._taskStats.totalErrors -= previousDescription.errors?.length || 0;\n      this._taskStats.totalWarnings -= previousDescription.warnings?.length || 0;\n    }\n\n    this._taskStats.remainingTasks++;\n    this._taskStats.status = 'pending';\n\n    const task: TaskDescription = {\n      ...description,\n      status: 'pending',\n      startTime: now,\n    };\n    if (index === -1) {\n      tasks.push(task);\n    } else {\n      tasks[index] = task;\n    }\n\n    bus.publish(taskStatsSource, this._taskStats);\n    bus.publish(taskListSource, { tasks });\n  }\n\n  /**\n   * Internal method to report the end of a task to the bus.\n   */\n  private _reportEnd(id: string, description: TaskEndDescription): void {\n    if (!this._context) return;\n    const { bus } = this._context;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (previousDescription) {\n      this._taskStats.remainingTasks--;\n      this._taskStats.totalErrors += description?.errors?.length || 0;\n      this._taskStats.totalWarnings += description?.warnings?.length || 0;\n\n      tasks[index] = {\n        ...previousDescription,\n        ...description,\n        status: 'complete',\n        durationMilliseconds: now - previousDescription.startTime,\n        lastUpdated: now,\n      };\n\n      if (this._taskStats.remainingTasks === 0) {\n        this._taskStats.status = 'idle';\n      }\n\n      bus.publish(taskStatsSource, this._taskStats);\n      bus.publish(taskListSource, { tasks });\n    }\n  }\n}\n"]}
+{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../src/utilities/TaskRunner.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TaskStartDescription } from '../types/TaskStartDescription.js';\nimport type { TaskEndDescription } from '../types/TaskEndDescription.js';\nimport type { TaskOptions } from '../types/TaskOptions.js';\nimport type { Task } from '../types/Task.js';\nimport type { TaskRunnerContext } from '../types/TaskRunnerContext.js';\nimport type { TaskStats } from '../types/TaskStats.js';\nimport type { TaskList } from '../types/TaskList.js';\nimport PQueue from 'p-queue';\nimport { getDefaultTaskStats } from './getDefaultTaskStats.js';\nimport { taskListSource, taskStatsSource, type TaskDescription } from '../index.browser.js';\n\n/**\n * TaskRunner class manages the state of Tasks.\n * This class is to be called by the api server.\n */\nexport class TaskRunner {\n  // Context is used to publish task status to the bus,\n  // so it is optional, as it is not needed during init or testing.\n  private _context: TaskRunnerContext | undefined;\n  private _queue: PQueue;\n  private _taskStats: TaskStats;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _pendingTasks: Map<string, Promise<any>>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _completedTasks: Map<string, any>;\n  private _requiresRerun: Set<string>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  private _prevTasks: Map<string, Task<any>>;\n\n  constructor(context?: TaskRunnerContext) {\n    this._context = context;\n    this._queue = new PQueue({ concurrency: 10 });\n    this._taskStats = getDefaultTaskStats();\n    this._pendingTasks = new Map();\n    this._completedTasks = new Map();\n    this._requiresRerun = new Set();\n    this._prevTasks = new Map();\n\n    if (this._context) {\n      const { bus, session } = this._context;\n      bus.publish([session.id, 'status'], this._taskStats);\n    }\n  }\n\n  /**\n   * The add method enqueues a Task and returns its Promise.\n   * If a Task with the same id has already been processed,\n   * it returns either the result or the promise.\n   * Rerun flag forces the Task to be run again.\n   */\n  add<TReturn>(task: Task<TReturn>, options?: TaskOptions): Promise<TReturn> {\n    const { name, id, execute } = task;\n    const { rerun, watch, priority } = options || {};\n\n    watch?.();\n\n    if (!this._prevTasks.get(id)) {\n      this._prevTasks.set(id, task);\n    }\n\n    // Check if we are already completed the task with that id.\n    const action = this._completedTasks.get(id) as TReturn | undefined;\n    if (action !== undefined && !rerun) {\n      return Promise.resolve(action);\n    }\n\n    // Check if we are already running the task with that id.\n    const pending = this._pendingTasks.get(id) as Promise<TReturn> | undefined;\n    if (pending !== undefined) {\n      if (rerun) {\n        this._requiresRerun.add(id);\n      }\n      return pending;\n    }\n\n    const resultPromise = (async () => {\n      let taskResult: TReturn | undefined;\n\n      do {\n        // Delete from rerun list (if present).\n        this._requiresRerun.delete(id);\n\n        taskResult = await this._queue.add(\n          async () => {\n            if (task.getStartDescription) {\n              this._reportStart(id, task.getStartDescription());\n            }\n\n            const result = await execute();\n\n            if (task.getEndDescription) {\n              this._reportEnd(id, task.getEndDescription(result));\n            }\n            return result;\n          },\n          // Removes void from return type.\n          // Read more on: https://github.com/sindresorhus/p-queue/issues/175\n          { throwOnTimeout: true, priority },\n        );\n      } while (this._requiresRerun.has(id));\n\n      // Delete from pending list.\n      this._pendingTasks.delete(id);\n\n      // Extra check to ensure that the task returned a value.\n      // It should never throw, if it does we have a bug.\n      if (taskResult === undefined) {\n        throw new Error(`Task \"${name}:${id}\" returned undefined, without throwing an error, which was unexpected.`);\n      }\n\n      // Update finished Tasks.\n      this._completedTasks.set(id, taskResult);\n\n      return taskResult;\n    })();\n\n    this._pendingTasks.set(id, resultPromise);\n    this._completedTasks.delete(id);\n\n    return resultPromise;\n  }\n\n  /**\n   * The remove method disposes a task if available\n   * and then removes it from the TaskRunner.\n   *\n   * This is useful when the state of a task needs to be cleared.\n   *\n   * It is intended to be used by the api server\n   * to clear the TaskRunner's state before reloading the page.\n   */\n  remove(id: string): void {\n    this._prevTasks\n      .get(id)\n      ?.dispose?.()\n      .catch(() => {\n        console.debug(`Error disposing task: ${id}`);\n      });\n    this._prevTasks.get(id)?.clear?.();\n    this._prevTasks.delete(id);\n    this._requiresRerun.delete(id);\n    this._pendingTasks.delete(id);\n    this._completedTasks.delete(id);\n  }\n  /**\n   * The clear method disposes all tasks and clears the TaskRunner.\n   */\n  clear(): void {\n    this._taskStats = getDefaultTaskStats();\n    if (this._context) {\n      const { bus, session } = this._context;\n      bus.publish([session.id, 'status'], this._taskStats);\n      bus.publish(taskListSource, { tasks: [] });\n    }\n    for (const id of this._prevTasks.keys()) {\n      this.remove(id);\n    }\n  }\n\n  /** Pauses the TaskRunner (for testing). */\n  _pause(): void {\n    this._queue.pause();\n  }\n\n  /** Starts or resumes the TaskRunner (for testing). */\n  _start(): void {\n    this._queue.start();\n  }\n\n  /**\n   * Internal method to report the start of a task to the bus.\n   */\n  private _reportStart(id: string, description: TaskStartDescription): void {\n    if (!this._context) return;\n    const { bus } = this._context;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (!previousDescription) {\n      this._taskStats.totalTasks++;\n    }\n\n    if (previousDescription?.status === 'complete') {\n      this._taskStats.totalErrors -= previousDescription.errors?.length || 0;\n      this._taskStats.totalWarnings -= previousDescription.warnings?.length || 0;\n    }\n\n    this._taskStats.remainingTasks++;\n    this._taskStats.status = 'pending';\n\n    const task: TaskDescription = {\n      ...description,\n      status: 'pending',\n      startTime: now,\n    };\n    if (index === -1) {\n      tasks.push(task);\n    } else {\n      tasks[index] = task;\n    }\n\n    bus.publish(taskStatsSource, this._taskStats);\n    bus.publish(taskListSource, { tasks });\n  }\n\n  /**\n   * Internal method to report the end of a task to the bus.\n   */\n  private _reportEnd(id: string, description: TaskEndDescription): void {\n    if (!this._context) return;\n    const { bus } = this._context;\n    const { tasks } = bus.getData<TaskList>(taskListSource.path) || { tasks: [] };\n    const index = tasks.findIndex((t) => t.id === id);\n    const previousDescription = tasks[index];\n    const now = new Date().getTime();\n\n    if (previousDescription) {\n      this._taskStats.remainingTasks--;\n      this._taskStats.totalErrors += description?.errors?.length || 0;\n      this._taskStats.totalWarnings += description?.warnings?.length || 0;\n\n      tasks[index] = {\n        ...previousDescription,\n        ...description,\n        status: 'complete',\n        durationMilliseconds: now - previousDescription.startTime,\n        lastUpdated: now,\n      };\n\n      if (this._taskStats.remainingTasks === 0) {\n        this._taskStats.status = 'idle';\n      }\n\n      bus.publish(taskStatsSource, this._taskStats);\n      bus.publish(taskListSource, { tasks });\n    }\n  }\n}\n"]}

package/lib/utilities/notifyReload.d.ts

@@ -1,8 +1,10 @@
 import type { DataBus } from '@ms-cloudpack/data-bus';
+import type { Session } from '../types/Session.js';
 /**
  * Notifies clients that a reload is needed by incrementing the session version.
  */
-export declare function notifyReload({ bus }: {
+export declare function notifyReload({ bus, session }: {
     bus: DataBus;
+    session: Session;
 }): void;
 //# sourceMappingURL=notifyReload.d.ts.map

package/lib/utilities/notifyReload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notifyReload.d.ts","sourceRoot":"","sources":["../../src/utilities/notifyReload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGtD;;GAEG;AACH,wBAAgB,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,QAIrD"}
+{"version":3,"file":"notifyReload.d.ts","sourceRoot":"","sources":["../../src/utilities/notifyReload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;GAEG;AACH,wBAAgB,YAAY,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,QAGhF"}

package/lib/utilities/notifyReload.js

@@ -2,8 +2,8 @@ import { reloadCountSource } from '../data/busSources.js';
 /**
  * Notifies clients that a reload is needed by incrementing the session version.
  */
-export function notifyReload({ bus }) {
-    const version = bus.getData(reloadCountSource) || 0;
-    bus.publish(reloadCountSource, version + 1);
+export function notifyReload({ bus, session }) {
+    session.sequence++;
+    bus.publish(reloadCountSource, session.sequence);
 }
 //# sourceMappingURL=notifyReload.js.map

package/lib/utilities/notifyReload.js.map

@@ -1 +1 @@
-{"version":3,"file":"notifyReload.js","sourceRoot":"","sources":["../../src/utilities/notifyReload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,EAAE,GAAG,EAAoB;IACpD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEpD,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;AAC9C,CAAC","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport { reloadCountSource } from '../data/busSources.js';\n\n/**\n * Notifies clients that a reload is needed by incrementing the session version.\n */\nexport function notifyReload({ bus }: { bus: DataBus }) {\n  const version = bus.getData(reloadCountSource) || 0;\n\n  bus.publish(reloadCountSource, version + 1);\n}\n"]}
+{"version":3,"file":"notifyReload.js","sourceRoot":"","sources":["../../src/utilities/notifyReload.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,EAAE,GAAG,EAAE,OAAO,EAAsC;IAC/E,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnB,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;AACnD,CAAC","sourcesContent":["import type { DataBus } from '@ms-cloudpack/data-bus';\nimport { reloadCountSource } from '../data/busSources.js';\nimport type { Session } from '../types/Session.js';\n\n/**\n * Notifies clients that a reload is needed by incrementing the session version.\n */\nexport function notifyReload({ bus, session }: { bus: DataBus; session: Session }) {\n  session.sequence++;\n  bus.publish(reloadCountSource, session.sequence);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/api-server",
-  "version": "0.43.0",
+  "version": "0.44.1",
   "description": "An implementation of the API server that does interacts with a task scheduler.",
   "license": "MIT",
   "type": "module",
@@ -27,21 +27,21 @@
     "@lage-run/logger": "^1.3.0",
     "@lage-run/scheduler": "^1.2.1",
     "@lage-run/target-graph": "^0.8.9",
-    "@ms-cloudpack/bundler": "^0.20.7",
-    "@ms-cloudpack/common-types": "^0.5.1",
-    "@ms-cloudpack/config": "^0.20.4",
-    "@ms-cloudpack/create-express-app": "^1.6.11",
+    "@ms-cloudpack/bundler": "^0.20.8",
+    "@ms-cloudpack/common-types": "^0.5.2",
+    "@ms-cloudpack/config": "^0.20.5",
+    "@ms-cloudpack/create-express-app": "^1.6.12",
     "@ms-cloudpack/data-bus": "^0.4.2",
     "@ms-cloudpack/file-watcher": "^0.1.2",
-    "@ms-cloudpack/import-map": "^0.5.0",
+    "@ms-cloudpack/import-map": "^0.5.1",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-hashes": "^0.5.15",
-    "@ms-cloudpack/package-utilities": "^7.4.3",
+    "@ms-cloudpack/package-hashes": "^0.5.16",
+    "@ms-cloudpack/package-utilities": "^7.4.4",
     "@ms-cloudpack/path-string-parsing": "^1.2.2",
-    "@ms-cloudpack/path-utilities": "^2.7.8",
-    "@ms-cloudpack/remote-cache": "^0.7.2",
+    "@ms-cloudpack/path-utilities": "^2.7.9",
+    "@ms-cloudpack/remote-cache": "^0.7.4",
     "@ms-cloudpack/task-reporter": "^0.14.0",
-    "@ms-cloudpack/telemetry": "^0.5.1",
+    "@ms-cloudpack/telemetry": "^0.5.2",
     "@trpc/client": "^10.45.0",
     "@trpc/server": "^10.45.0",
     "cors": "^2.8.5",

package/lib/startApiServer.d.ts

@@ -1,28 +0,0 @@
-import type { DataBus } from '@ms-cloudpack/data-bus';
-import type { TaskRunner } from './utilities/TaskRunner.js';
-import type { ApiServer } from './types/ApiServer.js';
-import type { Session } from './types/Session.js';
-import type { TelemetryClient } from '@ms-cloudpack/telemetry';
-import type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';
-/**
- * The api server handles the data pub/sub (for things like reporting build status)
- * and hosting the dashboard verb backend (for executing actions like loading vscode,
- * changing dependencies, connecting new projects to the running session, etc.)
- *
- * Each time `cloudpack start` is run, an api server will start up for that session. The
- * hosted web page will have a "cloudpack-api-server" header which points
- * to the websocket server.
- *
- * The bundle server will call the api server to publish build status updates.
- *
- * The app server will burn the api server url on the host html, so that client-side
- * javascript can connect and subscribe to page changes.
- */
-export declare function startApiServer(params: {
-    session: Session;
-    telemetryClient: TelemetryClient;
-    packages: PackageDefinitionsCache;
-    bus: DataBus;
-    taskRunner: TaskRunner;
-}): Promise<ApiServer>;
-//# sourceMappingURL=startApiServer.d.ts.map

package/lib/startApiServer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"startApiServer.d.ts","sourceRoot":"","sources":["../src/startApiServer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAW1E;;;;;;;;;;;;;GAaG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,uBAAuB,CAAC;IAClC,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC,SAAS,CAAC,CAqOrB"}

package/lib/startApiServer.js

@@ -1,215 +0,0 @@
-import getPort from 'get-port';
-import http from 'http';
-import https from 'https';
-import WebSocket, { WebSocketServer } from 'ws';
-import { validateOverride } from './utilities/validateOverride.js';
-import { parseHttpsConfig, getDomain } from '@ms-cloudpack/create-express-app';
-import { reloadCountSource } from './data/busSources.js';
-import { addPackageOverride } from './apis/addPackageOverride.js';
-import { openCodeEditor } from './apis/openCodeEditor.js';
-import { openFilePath } from './apis/openFilePath.js';
-import { reportMetric } from './apis/reportMetric.js';
-import { restartAllTasks } from './apis/restartAllTasks.js';
-import { restartTask } from './apis/restartTask.js';
-import { openConfigEditor } from './apis/openConfigEditor.js';
-/**
- * The api server handles the data pub/sub (for things like reporting build status)
- * and hosting the dashboard verb backend (for executing actions like loading vscode,
- * changing dependencies, connecting new projects to the running session, etc.)
- *
- * Each time `cloudpack start` is run, an api server will start up for that session. The
- * hosted web page will have a "cloudpack-api-server" header which points
- * to the websocket server.
- *
- * The bundle server will call the api server to publish build status updates.
- *
- * The app server will burn the api server url on the host html, so that client-side
- * javascript can connect and subscribe to page changes.
- */
-export async function startApiServer(params) {
-    const { session, telemetryClient, packages, bus, taskRunner } = params;
-    const host = getDomain(session.config?.devServer?.domain);
-    const port = await getPort({ port: [9890, 9891, 9892, 9893] });
-    // Create a node http(s) server.
-    let server;
-    const httpsConfig = session.config?.devServer?.https;
-    const protocol = httpsConfig ? 'wss' : 'ws';
-    if (httpsConfig) {
-        const { key, cert, passphrase } = parseHttpsConfig(httpsConfig);
-        if (!key || !cert) {
-            console.error('Invalid https config in cloudpack.config.json. Make sure key and cert are valid.');
-            throw new Error('Invalid https config.');
-        }
-        server = https
-            .createServer({
-            key,
-            cert,
-            passphrase,
-        }, () => {
-            /* no-op */
-        })
-            .listen(port, host);
-    }
-    else {
-        server = http.createServer().listen(port, host);
-    }
-    // Create a websocket server which listens for subscriptions and verb requests,
-    // and broadcasts the data to all connected clients.
-    const socketServer = new WebSocketServer({ server }, () => {
-        // console.log(`ApiServer: Started on port ${port}`);
-    }).on('connection', (socket) => {
-        const disposables = new Map();
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        function sendMessage(message) {
-            socket.send(JSON.stringify(message, null, 2));
-        }
-        socket.send(JSON.stringify({
-            type: 'sequence',
-            sequence: session.sequence,
-        }));
-        socket
-            .on('message', (rawData) => {
-            try {
-                // eslint-disable-next-line @typescript-eslint/no-base-to-string
-                const request = JSON.parse(rawData.toString());
-                const requestId = request.requestId || '';
-                switch (request.type) {
-                    /**
-                     * Subscribe to a data subscription.
-                     */
-                    case 'subscribe': {
-                        const { path: subscriptionPath, id } = request.data;
-                        disposables.set(id, bus.subscribe(subscriptionPath, 
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment
-                        (data) => sendMessage({ type: 'notify', id, path: subscriptionPath, data })));
-                        break;
-                    }
-                    /**
-                     * Unsubscribe from a data subscription.
-                     */
-                    case 'unsubscribe': {
-                        const id = request.data.id;
-                        if (id) {
-                            const dispose = disposables.get(id);
-                            if (dispose) {
-                                dispose();
-                                disposables.delete(id);
-                            }
-                        }
-                        break;
-                    }
-                    /**
-                     * Open a file in VSCode.
-                     */
-                    case 'openSource': {
-                        openCodeEditor({ input: request.data, ctx: {} }).catch(() => {
-                            // ignore
-                        });
-                        break;
-                    }
-                    /**
-                     * Open a file or folder in the OS's default file manager.
-                     */
-                    case 'open': {
-                        openFilePath({ input: request.data, ctx: { session } }).catch(() => {
-                            // ignore
-                        });
-                        break;
-                    }
-                    /**
-                     * Opens the cloudpack config in VSCode for the user to manually edit. If the file doesn't exist,
-                     * it will be created.
-                     */
-                    case 'editConfig': {
-                        openConfigEditor({ input: undefined, ctx: { session } }).catch(() => {
-                            /* no-op */
-                        });
-                        break;
-                    }
-                    /**
-                     * Adds an override to the cloudpack config.
-                     */
-                    case 'addOverride': {
-                        // TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.
-                        (async () => {
-                            const { packageName, importPath } = request.data;
-                            await addPackageOverride({
-                                input: { packageName, importPath },
-                                ctx: { session, bus, packages, taskRunner },
-                            });
-                        })().catch(() => {
-                            // no-op
-                        });
-                        break;
-                    }
-                    case 'validateOverride': {
-                        // TODO: Get filename from request data when chromium Issue 1371551 is fixed.
-                        (async () => {
-                            const input = request.data;
-                            const fixable = await validateOverride(input, { session, packages });
-                            const result = { fixable };
-                            sendMessage({ type: 'validateOverride', requestId, data: result });
-                        })().catch(() => {
-                            // no-op
-                        });
-                        break;
-                    }
-                    case 'restartAllTasks': {
-                        restartAllTasks({ input: undefined, ctx: { session, bus, taskRunner } }).catch(() => {
-                            // no-op
-                        });
-                        break;
-                    }
-                    case 'restartTask': {
-                        const { id, inputPath } = request.data;
-                        restartTask({ input: { id, inputPath }, ctx: { bus, taskRunner, session } });
-                        break;
-                    }
-                    case 'reportMetric': {
-                        reportMetric({ input: request.data, ctx: { telemetryClient } });
-                        break;
-                    }
-                    case 'getSessionId': {
-                        sendMessage({ type: 'sessionId', requestId, data: { sessionId: session.id } });
-                        break;
-                    }
-                }
-            }
-            catch (err) {
-                console.error('ApiServer: error handling message');
-                console.error('Error:', err.stack || err);
-                // eslint-disable-next-line @typescript-eslint/no-base-to-string
-                console.error('Message:', rawData.toString());
-            }
-        })
-            .on('close', () => {
-            for (const d of disposables.values()) {
-                d();
-            }
-        });
-    });
-    const notifyReload = () => {
-        session.sequence++;
-        socketServer.clients.forEach((socket) => {
-            if (socket.readyState === WebSocket.OPEN) {
-                socket.send(JSON.stringify({
-                    type: 'reload',
-                    data: { sessionId: session.id },
-                }));
-            }
-        });
-    };
-    bus.subscribe(reloadCountSource, notifyReload);
-    const url = `${protocol}://${host}:${port}`;
-    session.urls.apiServer = url;
-    return {
-        url,
-        port,
-        close: () => new Promise((resolve, reject) => {
-            socketServer.clients.forEach((socket) => socket.terminate());
-            socketServer.close((err) => (err ? reject(err) : resolve()));
-            server.close();
-        }),
-    };
-}
-//# sourceMappingURL=startApiServer.js.map

package/lib/startApiServer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"startApiServer.js","sourceRoot":"","sources":["../src/startApiServer.ts"],"names":[],"mappings":"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","sourcesContent":["import getPort from 'get-port';\nimport http from 'http';\nimport https from 'https';\nimport WebSocket, { WebSocketServer } from 'ws';\nimport type { DataBus } from '@ms-cloudpack/data-bus';\nimport type { TaskRunner } from './utilities/TaskRunner.js';\nimport type { ApiServer } from './types/ApiServer.js';\nimport type { Session } from './types/Session.js';\nimport { validateOverride } from './utilities/validateOverride.js';\nimport { parseHttpsConfig, getDomain } from '@ms-cloudpack/create-express-app';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/common-types';\nimport { reloadCountSource } from './data/busSources.js';\nimport { addPackageOverride, type AddPackageOverrideInput } from './apis/addPackageOverride.js';\nimport type { ValidatePackageOverrideInput, ValidatePackageOverrideOutput } from './apis/validatePackageOverride.js';\nimport { openCodeEditor, type OpenCodeEditorInput } from './apis/openCodeEditor.js';\nimport { openFilePath, type OpenFilePathInput } from './apis/openFilePath.js';\nimport { reportMetric, type ReportMetricInput } from './apis/reportMetric.js';\nimport { restartAllTasks } from './apis/restartAllTasks.js';\nimport { restartTask } from './apis/restartTask.js';\nimport { openConfigEditor } from './apis/openConfigEditor.js';\n\n/**\n * The api server handles the data pub/sub (for things like reporting build status)\n * and hosting the dashboard verb backend (for executing actions like loading vscode,\n * changing dependencies, connecting new projects to the running session, etc.)\n *\n * Each time `cloudpack start` is run, an api server will start up for that session. The\n * hosted web page will have a \"cloudpack-api-server\" header which points\n * to the websocket server.\n *\n * The bundle server will call the api server to publish build status updates.\n *\n * The app server will burn the api server url on the host html, so that client-side\n * javascript can connect and subscribe to page changes.\n */\nexport async function startApiServer(params: {\n  session: Session;\n  telemetryClient: TelemetryClient;\n  packages: PackageDefinitionsCache;\n  bus: DataBus;\n  taskRunner: TaskRunner;\n}): Promise<ApiServer> {\n  const { session, telemetryClient, packages, bus, taskRunner } = params;\n  const host = getDomain(session.config?.devServer?.domain);\n  const port = await getPort({ port: [9890, 9891, 9892, 9893] });\n\n  // Create a node http(s) server.\n  let server: http.Server | https.Server;\n  const httpsConfig = session.config?.devServer?.https;\n  const protocol = httpsConfig ? 'wss' : 'ws';\n\n  if (httpsConfig) {\n    const { key, cert, passphrase } = parseHttpsConfig(httpsConfig);\n\n    if (!key || !cert) {\n      console.error('Invalid https config in cloudpack.config.json. Make sure key and cert are valid.');\n\n      throw new Error('Invalid https config.');\n    }\n\n    server = https\n      .createServer(\n        {\n          key,\n          cert,\n          passphrase,\n        },\n        () => {\n          /* no-op */\n        },\n      )\n      .listen(port, host);\n  } else {\n    server = http.createServer().listen(port, host);\n  }\n\n  // Create a websocket server which listens for subscriptions and verb requests,\n  // and broadcasts the data to all connected clients.\n  const socketServer = new WebSocketServer({ server }, () => {\n    // console.log(`ApiServer: Started on port ${port}`);\n  }).on('connection', (socket: WebSocket) => {\n    const disposables = new Map<number, () => void>();\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    function sendMessage(message: any) {\n      socket.send(JSON.stringify(message, null, 2));\n    }\n\n    socket.send(\n      JSON.stringify({\n        type: 'sequence',\n        sequence: session.sequence,\n      }),\n    );\n\n    socket\n      .on('message', (rawData) => {\n        try {\n          // eslint-disable-next-line @typescript-eslint/no-base-to-string\n          const request = JSON.parse(rawData.toString()) as {\n            type: string;\n            requestId?: string;\n            data: Record<string, unknown>;\n          };\n\n          const requestId = request.requestId || '';\n\n          switch (request.type) {\n            /**\n             * Subscribe to a data subscription.\n             */\n            case 'subscribe': {\n              const { path: subscriptionPath, id } = request.data;\n\n              disposables.set(\n                id as number,\n                bus.subscribe(\n                  subscriptionPath as string[],\n                  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment\n                  (data: any) => sendMessage({ type: 'notify', id, path: subscriptionPath, data }),\n                ),\n              );\n\n              break;\n            }\n\n            /**\n             * Unsubscribe from a data subscription.\n             */\n            case 'unsubscribe': {\n              const id = request.data.id as number | undefined;\n              if (id) {\n                const dispose = disposables.get(id);\n\n                if (dispose) {\n                  dispose();\n                  disposables.delete(id);\n                }\n              }\n\n              break;\n            }\n\n            /**\n             * Open a file in VSCode.\n             */\n            case 'openSource': {\n              openCodeEditor({ input: request.data as OpenCodeEditorInput, ctx: {} }).catch(() => {\n                // ignore\n              });\n              break;\n            }\n\n            /**\n             * Open a file or folder in the OS's default file manager.\n             */\n            case 'open': {\n              openFilePath({ input: request.data as OpenFilePathInput, ctx: { session } }).catch(() => {\n                // ignore\n              });\n              break;\n            }\n\n            /**\n             * Opens the cloudpack config in VSCode for the user to manually edit. If the file doesn't exist,\n             * it will be created.\n             */\n            case 'editConfig': {\n              openConfigEditor({ input: undefined, ctx: { session } }).catch(() => {\n                /* no-op */\n              });\n              break;\n            }\n\n            /**\n             * Adds an override to the cloudpack config.\n             */\n            case 'addOverride': {\n              // TODO: Send filename from request data to findResolveMapEntry when chromium Issue 1371551 is fixed.\n              (async () => {\n                const { packageName, importPath } = request.data as AddPackageOverrideInput;\n                await addPackageOverride({\n                  input: { packageName, importPath },\n                  ctx: { session, bus, packages, taskRunner },\n                });\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'validateOverride': {\n              // TODO: Get filename from request data when chromium Issue 1371551 is fixed.\n              (async () => {\n                const input = request.data as ValidatePackageOverrideInput;\n                const fixable = await validateOverride(input, { session, packages });\n                const result: ValidatePackageOverrideOutput = { fixable };\n                sendMessage({ type: 'validateOverride', requestId, data: result });\n              })().catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'restartAllTasks': {\n              restartAllTasks({ input: undefined, ctx: { session, bus, taskRunner } }).catch(() => {\n                // no-op\n              });\n              break;\n            }\n\n            case 'restartTask': {\n              const { id, inputPath } = request.data as Record<string, string>;\n              restartTask({ input: { id, inputPath }, ctx: { bus, taskRunner, session } });\n              break;\n            }\n\n            case 'reportMetric': {\n              reportMetric({ input: request.data as ReportMetricInput, ctx: { telemetryClient } });\n              break;\n            }\n\n            case 'getSessionId': {\n              sendMessage({ type: 'sessionId', requestId, data: { sessionId: session.id } });\n              break;\n            }\n          }\n        } catch (err) {\n          console.error('ApiServer: error handling message');\n          console.error('Error:', (err as Error).stack || err);\n          // eslint-disable-next-line @typescript-eslint/no-base-to-string\n          console.error('Message:', rawData.toString());\n        }\n      })\n      .on('close', () => {\n        for (const d of disposables.values()) {\n          d();\n        }\n      });\n  });\n\n  const notifyReload = () => {\n    session.sequence++;\n    socketServer.clients.forEach((socket: WebSocket) => {\n      if (socket.readyState === WebSocket.OPEN) {\n        socket.send(\n          JSON.stringify({\n            type: 'reload',\n            data: { sessionId: session.id },\n          }),\n        );\n      }\n    });\n  };\n\n  bus.subscribe(reloadCountSource, notifyReload);\n\n  const url = `${protocol}://${host}:${port}`;\n  session.urls.apiServer = url;\n\n  return {\n    url,\n    port,\n    close: () =>\n      new Promise<void>((resolve, reject) => {\n        socketServer.clients.forEach((socket: WebSocket) => socket.terminate());\n        socketServer.close((err) => (err ? reject(err) : resolve()));\n        server.close();\n      }),\n  };\n}\n"]}