@playcademy/vite-plugin 1.1.2-beta.1 → 1.1.2-beta.3

package/dist/index.js

@@ -23746,7 +23746,7 @@ import path from "node:path";
 // package.json
 var package_default = {
   name: "@playcademy/vite-plugin",
-  version: "1.1.2-beta.1",
+  version: "1.1.2-beta.3",
   type: "module",
   exports: {
     ".": {
@@ -24476,6 +24476,7 @@ var init_game = __esm(() => {
     COLLABORATOR: "collaborator"
   };
 });
+var PLAYCADEMY_BROWSER_TIME_ZONE_HEADER = "x-playcademy-browser-time-zone";
 var CORE_GAME_UUIDS;
 var init_platform = __esm(() => {
   CORE_GAME_UUIDS = {
@@ -25344,7 +25345,7 @@ var package_default2;
 var init_package = __esm(() => {
   package_default2 = {
     name: "@playcademy/sandbox",
-    version: "0.6.0",
+    version: "0.6.1-beta.2",
     description: "Local development server for Playcademy game development",
     type: "module",
     exports: {
@@ -35335,6 +35336,11 @@ var init_table3 = __esm(() => {
     email: text("email").notNull().unique(),
     isAnonymous: boolean("is_anonymous").notNull().default(false),
     timebackId: text("timeback_id").unique(),
+    learningTimeZone: text("learning_time_zone"),
+    learningTimeZoneUpdatedAt: timestamp("learning_time_zone_updated_at", {
+      mode: "date",
+      withTimezone: true
+    }),
     emailVerified: boolean("email_verified").notNull().default(false),
     image: text("image"),
     role: userRoleEnum("role").notNull().default("player"),
@@ -55047,7 +55053,7 @@ var init_schemas4 = __esm(() => {
     subject: TimebackSubjectSchema,
     appName: exports_external.string().optional(),
     sensorUrl: exports_external.string().url().optional(),
-    courseId: exports_external.string().optional(),
+    courseId: exports_external.string().min(1).optional(),
     courseName: exports_external.string().optional(),
     studentEmail: exports_external.string().email().optional()
   });
@@ -100786,6 +100792,7 @@ class AnalyticsXp {
     this.core = core3;
   }
   async get(studentId, options) {
+    const timezone2 = options?.timezone ?? PLATFORM_TIMEZONE;
     const enrollments = await this.core.api.edubridge.enrollments.list({ userId: studentId });
     const filteredEnrollments = options?.courseIds?.length ? enrollments.filter((e) => options.courseIds.includes(e.course.id)) : enrollments;
     if (filteredEnrollments.length === 0) {
@@ -100799,7 +100806,7 @@ class AnalyticsXp {
       try {
         const analytics = await this.core.api.edubridge.analytics.getEnrollmentFacts({
           enrollmentId: enrollment.id,
-          timezone: PLATFORM_TIMEZONE
+          timezone: timezone2
         });
         return { enrollment, analytics };
       } catch (error88) {
@@ -100811,7 +100818,7 @@ class AnalyticsXp {
         return { enrollment, analytics: null };
       }
     }));
-    const today = formatDateYMDInTimezone(PLATFORM_TIMEZONE);
+    const today = formatDateYMDInTimezone(timezone2);
     let totalXp = 0;
     let todayXp = 0;
     const courses = [];
@@ -105571,6 +105578,24 @@ var init_timeback_service = __esm(async () => {
         }
       };
     }
+    static resolveRuntimeCourse(resolvedCourseId, requestedCourseId, courseName) {
+      let requestedCourseIdStatus = "absent";
+      if (requestedCourseId === resolvedCourseId) {
+        requestedCourseIdStatus = "accepted";
+      } else if (requestedCourseId !== undefined) {
+        requestedCourseIdStatus = "ignored_mismatch";
+      }
+      return {
+        courseId: resolvedCourseId,
+        courseName: requestedCourseIdStatus === "ignored_mismatch" ? undefined : courseName,
+        attributes: {
+          "app.timeback.course_id": resolvedCourseId,
+          "app.timeback.resolved_course_id": resolvedCourseId,
+          "app.timeback.requested_course_id": requestedCourseId,
+          "app.timeback.requested_course_id_status": requestedCourseIdStatus
+        }
+      };
+    }
     static recordRuntimeContext({
       operation,
       studentId,
@@ -106436,8 +106461,13 @@ var init_timeback_service = __esm(async () => {
         if (!integration) {
           throw new NotFoundError(`Timeback integration for game (grade ${activityData.grade}, subject ${activityData.subject})`);
         }
+        const {
+          courseId: runtimeCourseId,
+          courseName: runtimeCourseName,
+          attributes: courseAttributes
+        } = TimebackService2.resolveRuntimeCourse(integration.courseId, activityData.courseId, activityData.courseName);
         const scorePercentage = scoreData.totalQuestions > 0 ? scoreData.correctQuestions / scoreData.totalQuestions * 100 : 0;
-        const result = await client.activity.record(integration.courseId, studentId, {
+        const result = await client.activity.record(runtimeCourseId, studentId, {
           gameId,
           score: scorePercentage,
           totalQuestions: scoreData.totalQuestions,
@@ -106452,8 +106482,8 @@ var init_timeback_service = __esm(async () => {
           subject: activityData.subject,
           appName: activityData.appName,
           sensorUrl: activityData.sensorUrl,
-          courseId: activityData.courseId,
-          courseName: activityData.courseName,
+          courseId: runtimeCourseId,
+          courseName: runtimeCourseName,
           studentEmail: activityData.studentEmail,
           courseTotalXp: integration.totalXp,
           ...runId ? { runId } : {}
@@ -106462,7 +106492,7 @@ var init_timeback_service = __esm(async () => {
         const sessionEndInactiveSeconds = sessionTimingData?.inactiveSeconds;
         const sessionEndEmitted = sessionEndActiveSeconds > 0 || (sessionEndInactiveSeconds ?? 0) > 0;
         if (sessionEndEmitted) {
-          await client.activity.session(integration.courseId, studentId, {
+          await client.activity.session(runtimeCourseId, studentId, {
             gameId,
             activeTimeSeconds: sessionEndActiveSeconds,
             ...sessionEndInactiveSeconds !== undefined ? { inactiveTimeSeconds: sessionEndInactiveSeconds } : {},
@@ -106471,15 +106501,15 @@ var init_timeback_service = __esm(async () => {
             subject: activityData.subject,
             appName: activityData.appName,
             sensorUrl: activityData.sensorUrl,
-            courseId: activityData.courseId,
-            courseName: activityData.courseName,
+            courseId: runtimeCourseId,
+            courseName: runtimeCourseName,
             studentEmail: activityData.studentEmail,
             extensions: extensionsWithResumeId,
             ...runId ? { runId } : {}
           });
         }
         setAttributes({
-          "app.timeback.course_id": integration.courseId,
+          ...courseAttributes,
           "app.timeback.grade": activityData.grade,
           "app.timeback.subject": activityData.subject,
           "app.timeback.total_questions": scoreData.totalQuestions,
@@ -106496,7 +106526,7 @@ var init_timeback_service = __esm(async () => {
         });
         return {
           status: "ok",
-          courseId: integration.courseId,
+          courseId: runtimeCourseId,
           xpAwarded: result.xpAwarded,
           masteredUnits: result.masteredUnitsApplied,
           pctCompleteApp: result.pctCompleteApp,
@@ -106707,10 +106737,15 @@ var init_timeback_service = __esm(async () => {
           if (!integration) {
             throw new NotFoundError(`Timeback integration for game (grade ${activityData.grade}, subject ${activityData.subject})`);
           }
+          const {
+            courseId: runtimeCourseId,
+            courseName: runtimeCourseName,
+            attributes: courseAttributes
+          } = TimebackService2.resolveRuntimeCourse(integration.courseId, activityData.courseId, activityData.courseName);
           const activeTimeSeconds = timingData.activeMs / 1000;
           const inactiveTimeSeconds = timingData.pausedMs / 1000;
           if (activeTimeSeconds > 0 || inactiveTimeSeconds > 0) {
-            await client.activity.session(integration.courseId, studentId, {
+            await client.activity.session(runtimeCourseId, studentId, {
               gameId,
               activeTimeSeconds,
               ...inactiveTimeSeconds > 0 ? { inactiveTimeSeconds } : {},
@@ -106719,15 +106754,15 @@ var init_timeback_service = __esm(async () => {
               subject: activityData.subject,
               appName: activityData.appName,
               sensorUrl: activityData.sensorUrl,
-              courseId: activityData.courseId,
-              courseName: activityData.courseName,
+              courseId: runtimeCourseId,
+              courseName: runtimeCourseName,
               studentEmail: activityData.studentEmail,
               extensions: TimebackService2.addResumeIdToExtensions(undefined, effectiveResumeId),
               ...runId ? { runId } : {}
             });
           }
           setAttributes({
-            "app.timeback.course_id": integration.courseId,
+            ...courseAttributes,
             "app.timeback.grade": activityData.grade,
             "app.timeback.subject": activityData.subject,
             "app.timeback.active_time_seconds": activeTimeSeconds,
@@ -106772,13 +106807,24 @@ var init_timeback_service = __esm(async () => {
             };
           }
         }
+        const timezone2 = await this.getLearningTimeZoneForStudent(timebackId);
         const result = await client.analytics.getXp(timebackId, {
           courseIds: courseIds.length > 0 ? courseIds : undefined,
+          timezone: timezone2,
           include: options?.include
         });
         return result;
       });
     }
+    async getLearningTimeZoneForStudent(timebackId) {
+      const user = await this.deps.db.query.users.findFirst({
+        where: eq(users.timebackId, timebackId),
+        columns: {
+          learningTimeZone: true
+        }
+      });
+      return user?.learningTimeZone ?? PLATFORM_TIMEZONE;
+    }
     async getStudentMastery(timebackId, user, options) {
       return this.withClientTelemetry(async () => {
         const client = this.requireClient();
@@ -107540,13 +107586,26 @@ var init_session_service = __esm(() => {
   init_spans();
   init_errors();
 });
+function normalizeIanaTimeZone(value) {
+  const timeZone = value?.trim();
+  if (!timeZone || timeZone.length > MAX_IANA_TIME_ZONE_LENGTH) {
+    return;
+  }
+  try {
+    new Intl.DateTimeFormat("en-US", { timeZone }).format(new Date);
+    return timeZone;
+  } catch {
+    return;
+  }
+}
+var MAX_IANA_TIME_ZONE_LENGTH = 100;
 
 class UserService {
   deps;
   constructor(deps) {
     this.deps = deps;
   }
-  async getMe(user, gameId) {
+  async getMe(user, gameId, observedTimeZone) {
     const db2 = this.deps.db;
     const userData = await db2.query.users.findFirst({
       where: eq(users.id, user.id)
@@ -107559,6 +107618,7 @@ class UserService {
       "app.user.has_timeback_account": Boolean(userData.timebackId),
       "app.user.timeback_enriched": false
     });
+    const localDay = await this.resolveLocalDay(userData, observedTimeZone);
     const timeback2 = userData.timebackId ? await this.fetchTimebackData(userData.timebackId, gameId) : undefined;
     setAttribute("app.user.timeback_enriched", Boolean(timeback2));
     if (gameId) {
@@ -107568,6 +107628,7 @@ class UserService {
         role: userData.role,
         username: userData.username,
         email: userData.email,
+        localDay,
         timeback: timeback2
       };
     }
@@ -107587,6 +107648,7 @@ class UserService {
       createdAt: userData.createdAt,
       updatedAt: userData.updatedAt,
       hasTimebackAccount: Boolean(timebackAccount),
+      localDay,
       timeback: timeback2
     };
   }
@@ -107624,6 +107686,44 @@ class UserService {
       isDefault: updatedUser.name === DEMO_DISPLAY_NAME_PLACEHOLDER
     };
   }
+  async resolveLocalDay(userData, observedTimeZone) {
+    const normalizedTimeZone = normalizeIanaTimeZone(observedTimeZone);
+    if (normalizedTimeZone) {
+      const observedAt = new Date;
+      const shouldPersist = userData.learningTimeZone !== normalizedTimeZone || !userData.learningTimeZoneUpdatedAt || observedAt.getTime() - userData.learningTimeZoneUpdatedAt.getTime() >= LEARNING_TIME_ZONE_REFRESH_INTERVAL_MS;
+      if (shouldPersist) {
+        await this.deps.db.update(users).set({
+          learningTimeZone: normalizedTimeZone,
+          learningTimeZoneUpdatedAt: observedAt
+        }).where(eq(users.id, userData.id));
+      }
+      setAttributes({
+        "app.user.learning_time_zone_observed": true,
+        "app.user.learning_time_zone_persisted": shouldPersist
+      });
+      return {
+        timeZone: normalizedTimeZone,
+        source: "browser_last_seen",
+        observedAt: (shouldPersist ? observedAt : userData.learningTimeZoneUpdatedAt)?.toISOString() ?? null
+      };
+    }
+    setAttributes({
+      "app.user.learning_time_zone_observed": false,
+      "app.user.learning_time_zone_persisted": false
+    });
+    if (userData.learningTimeZone) {
+      return {
+        timeZone: userData.learningTimeZone,
+        source: "browser_last_seen",
+        observedAt: userData.learningTimeZoneUpdatedAt?.toISOString() ?? null
+      };
+    }
+    return {
+      timeZone: PLATFORM_TIMEZONE,
+      source: "platform_default",
+      observedAt: null
+    };
+  }
   async fetchTimebackData(timebackId, gameId) {
     const [{ role, organizations: allOrganizations }, allEnrollments] = await Promise.all([
       withSpan("timeback.fetch_profile", () => this.fetchStudentProfile(timebackId)),
@@ -107705,6 +107805,7 @@ class UserService {
     return organizations.filter((o) => enrollmentOrgIds.has(o.id));
   }
 }
+var LEARNING_TIME_ZONE_REFRESH_INTERVAL_MS;
 var init_user_service = __esm(() => {
   init_drizzle_orm();
   init_src();
@@ -107713,6 +107814,7 @@ var init_user_service = __esm(() => {
   init_spans();
   init_errors();
   init_timeback_util();
+  LEARNING_TIME_ZONE_REFRESH_INTERVAL_MS = 86400000;
 });
 
 class VerifyService {
@@ -168001,9 +168103,10 @@ var getDemoProfile;
 var updateDemoProfile;
 var users2;
 var init_user_controller = __esm(() => {
+  init_src();
   init_schemas_index();
   init_utils11();
-  getMe = requireNonAnonymous(async (ctx) => ctx.services.user.getMe(ctx.user, ctx.gameId));
+  getMe = requireNonAnonymous(async (ctx) => ctx.services.user.getMe(ctx.user, ctx.gameId, ctx.request.headers.get(PLAYCADEMY_BROWSER_TIME_ZONE_HEADER)));
   getDemoProfile = requireAnonymous(async (ctx) => ctx.services.user.getDemoProfile(ctx.user.id));
   updateDemoProfile = requireAnonymous(async (ctx) => {
     const body2 = await parseRequestBody(ctx.request, DemoProfileSchema);
@@ -168148,8 +168251,39 @@ function getMockHighestGradeMastered(enrollments, subject) {
   const subjectGrades = enrollments.filter((enrollment) => enrollment.subject === subject).map((enrollment) => enrollment.grade);
   return subjectGrades.length > 0 ? Math.max(...subjectGrades) : null;
 }
-async function buildMockUserResponse(db2, user, gameId) {
+async function buildLocalDayContext(db2, user, observedTimeZone) {
+  const normalizedTimeZone = normalizeIanaTimeZone(observedTimeZone);
+  if (normalizedTimeZone) {
+    const observedAt = new Date;
+    const shouldPersist = user.learningTimeZone !== normalizedTimeZone || !user.learningTimeZoneUpdatedAt || observedAt.getTime() - user.learningTimeZoneUpdatedAt.getTime() >= LEARNING_TIME_ZONE_REFRESH_INTERVAL_MS2;
+    if (shouldPersist) {
+      await db2.update(users).set({
+        learningTimeZone: normalizedTimeZone,
+        learningTimeZoneUpdatedAt: observedAt
+      }).where(eq(users.id, user.id));
+    }
+    return {
+      timeZone: normalizedTimeZone,
+      source: "browser_last_seen",
+      observedAt: (shouldPersist ? observedAt : user.learningTimeZoneUpdatedAt)?.toISOString() ?? null
+    };
+  }
+  if (user.learningTimeZone) {
+    return {
+      timeZone: user.learningTimeZone,
+      source: "browser_last_seen",
+      observedAt: user.learningTimeZoneUpdatedAt?.toISOString() ?? null
+    };
+  }
+  return {
+    timeZone: PLATFORM_TIMEZONE,
+    source: "platform_default",
+    observedAt: null
+  };
+}
+async function buildMockUserResponse(db2, user, gameId, observedTimeZone) {
   const timeback3 = user.timebackId ? await getMockTimebackData(db2, user.timebackId, gameId) : undefined;
+  const localDay = await buildLocalDayContext(db2, user, observedTimeZone);
   if (gameId) {
     return {
       id: user.id,
@@ -168157,6 +168291,7 @@ async function buildMockUserResponse(db2, user, gameId) {
       role: user.role,
       username: user.username,
       email: user.email,
+      localDay,
       timeback: timeback3
     };
   }
@@ -168175,15 +168310,19 @@ async function buildMockUserResponse(db2, user, gameId) {
     createdAt: user.createdAt,
     updatedAt: user.updatedAt,
     hasTimebackAccount: Boolean(timebackAccount),
+    localDay,
     timeback: timeback3
   };
 }
+var LEARNING_TIME_ZONE_REFRESH_INTERVAL_MS2;
 var init_timeback6 = __esm(() => {
   init_drizzle_orm();
   init_utils11();
+  init_src();
   init_tables_index();
   init_src2();
   init_config();
+  LEARNING_TIME_ZONE_REFRESH_INTERVAL_MS2 = 86400000;
 });
 var usersRouter;
 var init_users = __esm(async () => {
@@ -168191,6 +168330,7 @@ var init_users = __esm(async () => {
   init_dist7();
   init_controllers();
   init_errors();
+  init_src();
   init_tables_index();
   init_error_handler();
   init_timeback6();
@@ -168212,7 +168352,7 @@ var init_users = __esm(async () => {
         const error89 = ApiError.notFound("User not found");
         return c2.json(createErrorResponse(error89), error89.status);
       }
-      const response = await buildMockUserResponse(db2, userData, gameId);
+      const response = await buildMockUserResponse(db2, userData, gameId, c2.req.header(PLAYCADEMY_BROWSER_TIME_ZONE_HEADER));
       return c2.json(response);
     }
     return handle2(users2.getMe)(c2);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/vite-plugin",
-    "version": "1.1.2-beta.1",
+    "version": "1.1.2-beta.3",
     "type": "module",
     "exports": {
         ".": {
@@ -19,14 +19,14 @@
     "dependencies": {
         "archiver": "^7.0.1",
         "picocolors": "^1.1.1",
-        "playcademy": "0.26.1-beta.1"
+        "playcademy": "0.26.1-beta.3"
     },
     "devDependencies": {
         "@electric-sql/pglite": "^0.3.16",
         "@inquirer/prompts": "^7.8.6",
         "@playcademy/constants": "0.0.1",
-        "@playcademy/sandbox": "0.6.0",
-        "@playcademy/sdk": "0.14.0",
+        "@playcademy/sandbox": "0.6.1-beta.2",
+        "@playcademy/sdk": "0.14.1-beta.2",
         "@playcademy/types": "0.0.1",
         "@playcademy/utils": "0.0.1",
         "@types/archiver": "^6.0.3",