@cookielab.io/oopst 0.1.0 → 0.2.0

package/dist/index.js

@@ -4341,7 +4341,7 @@ init_esm_shims();
 
 // src/sync/aggregate.ts
 init_esm_shims();
-import { createHash } from "crypto";
+import { createHmac } from "crypto";
 function toIso(hourUtc) {
   return hourUtc instanceof Date ? hourUtc.toISOString() : hourUtc;
 }
@@ -4360,8 +4360,12 @@ function finalize(acc) {
     sessionCount: acc.sessionIds.size
   };
 }
-function createSessionKey(harness, localSessionId) {
-  return createHash("sha256").update(harness).update("\0").update(localSessionId).digest("hex");
+var SESSION_KEY_SALT_PATTERN = /^[a-f0-9]{64}$/u;
+function createSessionKey(harness, localSessionId, sessionKeySalt) {
+  if (!SESSION_KEY_SALT_PATTERN.test(sessionKeySalt)) {
+    throw new Error("invalid session key salt");
+  }
+  return createHmac("sha256", Buffer.from(sessionKeySalt, "hex")).update("oopst/session-key/v1").update("\0").update(harness).update("\0").update(localSessionId).digest("hex");
 }
 function sessionMapKey(harness, sessionKey) {
   return `${harness} ${sessionKey}`;
@@ -4374,8 +4378,8 @@ function finalizeSession(acc) {
     lastSeenAt: acc.lastSeenAt.toISOString()
   };
 }
-function addSessionAccumulator(sessionAccumulators, bucket, localSessionId) {
-  const sessionKey = createSessionKey(bucket.harness, localSessionId);
+function addSessionAccumulator(sessionAccumulators, bucket, localSessionId, sessionKeySalt) {
+  const sessionKey = createSessionKey(bucket.harness, localSessionId, sessionKeySalt);
   const sessionAccumulatorKey = sessionMapKey(bucket.harness, sessionKey);
   const existingSession = sessionAccumulators.get(sessionAccumulatorKey);
   if (existingSession) {
@@ -4419,7 +4423,7 @@ async function* aggregateUsage(source, options) {
     acc.cacheCreateTokens += bucket.cacheCreateTokens;
     for (const id of bucket.sessionIds) {
       acc.sessionIds.add(id);
-      addSessionAccumulator(sessionAccumulators, bucket, id);
+      addSessionAccumulator(sessionAccumulators, bucket, id, options.sessionKeySalt);
     }
   }
   const finalized = [];
@@ -5827,10 +5831,14 @@ async function runSync(options) {
   const client = options.client ?? createClient({ token: options.token, serverUrl: options.serverUrl, fetch: options.fetch });
   const color = options.color === true;
   let watermark = null;
+  let sessionKeySalt;
   try {
     options.logger.info(phase("Checking server sync point...", color));
-    const wm = await client.sync.getWatermark.query({ device: options.device });
-    watermark = wm.watermarkHourUtc ? new Date(wm.watermarkHourUtc) : null;
+    const { sessionKeySalt: returnedSessionKeySalt, watermarkHourUtc } = await client.sync.getWatermark.mutate({
+      device: options.device
+    });
+    watermark = watermarkHourUtc ? new Date(watermarkHourUtc) : null;
+    sessionKeySalt = returnedSessionKeySalt;
   } catch (err) {
     return failureFromTrpcError(err, options.logger);
   }
@@ -5858,7 +5866,10 @@ async function runSync(options) {
   const batches = [];
   try {
     const progressSources = sources.map((source) => withScanProgress(source, options.logger, color));
-    for await (const batch of aggregateUsage(merge(progressSources), { batchSize: SYNC_BATCH_SIZE })) {
+    for await (const batch of aggregateUsage(merge(progressSources), {
+      batchSize: SYNC_BATCH_SIZE,
+      sessionKeySalt
+    })) {
       if (batch.buckets.length === 0 && batch.sessions.length === 0) {
         continue;
       }
@@ -5887,7 +5898,7 @@ async function runSync(options) {
     options.logger.info(
       `${dryRunPrefix(color)} ${usageRecordText(plannedBuckets)} from ${localSessionText(plannedSessions)} would be uploaded in ${uploadRequestText(batches.length)}.`
     );
-    options.logger.info(muted("No data was sent.", color));
+    options.logger.info(muted("No usage data was uploaded.", color));
     return {
       exitCode: EXIT.success,
       batchesUploaded: batches.length,