@sorisdk/web-audio 0.6.7 → 0.6.9

package/README.md

@@ -13,6 +13,36 @@ Public integration guide: https://docs.soriapi.com/ko/integration/web
 - An ephemeral key issued by your server
 - Microphone permission granted by the user
 
+## Unreleased: Console-resolved audio marker events
+
+The public `audiomarker` event now contains only the marker identity managed in
+SORI Console. The SDK emits it after a successful activity POST or refinement
+PUT returns both a non-blank `audio_marker_id` and `audio_marker_name`:
+
+```ts
+recognizer.on("audiomarker", ({ marker }) => {
+  console.log(marker.id, marker.name);
+});
+```
+
+The event is independent from campaign mapping and can be emitted when the
+activity response has no campaign. Repeated responses within one continuous
+material segment emit once; an intervening material, no-match, capture reset,
+or expired continuity gap starts a new segment that may emit again.
+
+Local WASM detection and labels such as `code_000` remain private inputs to the
+activity request. They are no longer present on public `audiomarker` or `match`
+events, `campaign.match`, the exported `DetectedMatch`, or the
+`@sorisdk/web-audio` type exports. Custom request and campaign mappers receive
+the public codebook-free match; the SDK adds its private `trait.marker` only to
+the outgoing activity payload after request mapping.
+
+This deliberately replaces the 0.6.7-and-earlier event shape. Migrate from
+`event.marker` as a nullable string and `event.detection` as a raw detector
+result to the non-null `event.marker.id` and `event.marker.name` fields above.
+There is no legacy fallback: disabled activity reporting, failed transport, or
+a response with a missing or malformed id/name pair emits no public marker.
+
 ## Standalone CDN
 
 For a browser application that does not use npm or a bundler, import the
@@ -22,7 +52,7 @@ configuration, or Node-based asset server is required:
 ```html
 <script type="module">
   import { AudioRecognizer } from
-    "https://cdn.iplateia.com/web/sorisdk/v0.6.7/sori-web-audio.mjs";
+    "https://cdn.iplateia.com/web/sorisdk/v0.6.9/sori-web-audio.mjs";
 
   const recognizer = new AudioRecognizer({
     appId: "YOUR_APP_ID",
@@ -49,7 +79,7 @@ configuration, or Node-based asset server is required:
 ```
 
 Static URL imports are valid inside `<script type="module">`. Dynamic
-`await import("https://cdn.iplateia.com/web/sorisdk/v0.6.7/sori-web-audio.mjs")`
+`await import("https://cdn.iplateia.com/web/sorisdk/v0.6.9/sori-web-audio.mjs")`
 is an optional alternative when the SDK should be loaded conditionally.
 
 Pin an exact version in production. Do not construct a mutable `latest` URL.
@@ -119,7 +149,7 @@ An import map can give the standalone URL the npm package name:
 <script type="importmap">
 {
   "imports": {
-    "@sorisdk/web-audio": "https://cdn.iplateia.com/web/sorisdk/v0.6.7/sori-web-audio.mjs"
+    "@sorisdk/web-audio": "https://cdn.iplateia.com/web/sorisdk/v0.6.9/sori-web-audio.mjs"
   }
 }
 </script>
@@ -171,6 +201,10 @@ recognizer.on("campaign", (event) => {
   console.log(event.activityId, event.campaign);
 });
 
+recognizer.on("audiomarker", ({ marker }) => {
+  console.log(marker.id, marker.name);
+});
+
 recognizer.on("error", ({ error }) => {
   console.error(error);
 });
@@ -185,6 +219,22 @@ await recognizer.stop();
 await recognizer.destroy();
 ```
 
+## Continuous recognition
+
+Continuous observations of one material emit one public `match`. An intervening
+material (A → B → A), two consecutive fingerprint no-match results, or a gap
+greater than 30 seconds since the last successful observation starts a new run.
+The next successful A is delivered immediately. A single fingerprint miss or
+marker miss does not split a run. Successful observations renew continuity even
+when no public `match` event is emitted, in both marker modes.
+
+The 30-second boundary also covers capture interruptions with no queries; it is
+checked when querying resumes. Two consecutive misses can confirm a boundary
+sooner. `nomatch` is emitted on an observed boundary, rather than by an idle
+timer. Sequential stop/start, failed-start cleanup, and successful database
+replacement or mutation clear recognition and capture state. Pending queries
+from an older capture cannot restore suppression in the new capture.
+
 ## Activity refinement
 
 The default `AudioRecognizer` activity reporter represents one ordered,
@@ -200,13 +250,15 @@ server activity:
 3. A marker-free match with an active marker-scan request also includes
    top-level `refinement_expected: true`.
 4. The returned `activity_id` is retained for 30 seconds.
-5. If the same recognition gains `audioMarker.code`, the SDK sends
+5. If the same recognition gains a private local marker detection, the SDK sends
    `PUT /api/activity/{activity_id}` with the same material and
    `trait.marker`.
-6. The refined `campaign` event keeps the same non-empty `activityId`, so an
+6. A valid response marker id/name pair emits one public structured
+   `audiomarker` event, even when the response has no campaign.
+7. The refined `campaign` event keeps the same non-empty `activityId`, so an
    application can replace the earlier campaign row deterministically.
 
-A consecutive match for the same material and fingerprint type renews a local
+A successful observation for the same material and fingerprint type renews a local
 30-second continuity lease without another POST or campaign event. That local
 lease can keep one segment alive beyond the initial server refinement window,
 but it never extends the original PUT deadline. A marker confirmed anywhere
@@ -228,10 +280,10 @@ refine the earlier A. Marker evidence arriving after a segment is sealed is
 ignored for that segment; create or PUT transport that already started may
 finish under the existing capture, deadline, and cancellation guards.
 
-Ordinary fingerprint `match` and marker-state `audiomarker` events remain
-independently observable; coalescing only changes activity mutation and
-campaign delivery. An `audiomarker` event alone does not mean that server
-activity refinement completed.
+Fingerprint `match` events follow the continuous-run rules above and never
+contain the private detector result. Public `audiomarker` delivery is sourced
+only from a completed activity response. It is independent from campaign
+availability but does prove that the server resolved the marker id and name.
 
 Recognition timing belongs only to the segment's first material POST. Later
 same-material observations update only the internal `lastObservedAt` lease;
@@ -273,7 +325,10 @@ Existing `mapMatchToRequest` and `mapResponseToCampaign` hooks continue to
 handle POST. Additive refinement hooks can override the PUT payload, response
 mapping, endpoint, headers, fetcher, and retry policy. The stable terminal
 statuses 404, 409, and 410 are never retried even if a custom policy returns
-`true`.
+`true`. Match arguments passed to these hooks omit private detector state. When
+local detection succeeds, the SDK injects its private marker into the outgoing
+`trait.marker` after request mapping, while resolved public identity is parsed
+directly from the unmodified activity response before campaign delivery.
 
 `recognized_at` and `position` are optional public request properties for
 source compatibility, but they are SDK-owned transport values. After a custom
@@ -404,7 +459,8 @@ fingerprint chunks and the existing match-window cadence are unchanged.
 
 1. Prepare your `appId` and ephemeral key flow.
 2. Create an `AudioRecognizer`.
-3. Subscribe to the events you need, such as `campaign`, `match`, and `error`.
+3. Subscribe to the events you need, such as `campaign`, `audiomarker`, `match`,
+   and `error`.
 4. Call `start()` to begin recognition.
 5. Call `stop()` or `destroy()` when leaving the page or stopping capture.
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { MatcherEphemeralAuthOptions, InitMatcherOptions, MatcherEphemeralAuthResult, AudioMarkerDetection, PackSource, MatchResult, MatcherSessionOptions, AudioFingerprintType } from '@sorisdk/matcher';
-export { AudioFingerprintType, AudioMarkerConfig, AudioMarkerDetection, PackSource } from '@sorisdk/matcher';
+import { MatcherEphemeralAuthOptions, InitMatcherOptions, MatcherEphemeralAuthResult, PackSource, MatchResult, MatcherSessionOptions, AudioFingerprintType } from '@sorisdk/matcher';
+export { AudioFingerprintType, AudioMarkerConfig, PackSource } from '@sorisdk/matcher';
 import { InitAfpgenOptions } from '@sorisdk/afpgen';
 
 declare const DEFAULT_BROWSER_AUDIOPACK_VERSION = "20220401000000";
@@ -53,11 +53,14 @@ interface InitMatchWindowWasmOptions {
 }
 
 interface DetectedMatch extends Pick<MatchResult, "afpType" | "durationMillis" | "name" | "position" | "score"> {
-    audioMarker?: AudioMarkerDetection | null;
+}
+/** SORI Console-managed identity resolved from a successful activity response. */
+interface AudioMarkerIdentity {
+    readonly id: string;
+    readonly name: string;
 }
 interface AudioMarkerEvent {
-    marker: string | null;
-    detection: AudioMarkerDetection;
+    readonly marker: AudioMarkerIdentity;
 }
 interface MaterialActivityRequestPayload {
     type: "material";
@@ -243,7 +246,6 @@ declare class MicrophoneMatcher {
     private markerPcmBuffer;
     private resampleBuffer;
     private resampleOffset;
-    private latestAudioMarker;
     private latestAudioMarkerDetection;
     private audioMarkerRequestId;
     private activityRecognitionId;
@@ -281,7 +283,6 @@ declare class MicrophoneMatcher {
     private detectAudioMarkerForRequest;
     private matchConfig;
     private withAudioMarkerForRequest;
-    private emitAudioMarkerIfChanged;
     private normalizeInputSamples;
     private resampleToTargetRate;
     private cleanupAfterStartFailure;
@@ -296,4 +297,4 @@ declare function requestMicrophoneStream(mediaDevices: MediaDevices, mediaConstr
     preferredSampleRate?: number;
 }): Promise<MediaStream>;
 
-export { ACTIVITY_REFINEMENT_WINDOW_MS, type ActivityRefinementFailureContext, type ActivityRefinementRequestContext, type AudioMarkerEvent, AudioRecognizer, type AudioRecognizerAuthOptions, type AudioRecognizerOptions, type AuthenticateAndLoadAudioPackOptions, type AuthenticateAndLoadAudioPackResult, type BrowserAudioPackLoader, type BrowserAudioPackState, type BrowserAudioPackStateStore, type BrowserSessionManager, type CreateLocalStorageAudioPackStoreOptions, type CreateLocalStorageSessionManagerOptions, type CreateMicrophoneMatcherOptions, type CreateMicrophoneMatcherWasmOptions, DEFAULT_BROWSER_AUDIOPACK_VERSION, DEFAULT_SORI_API_ENDPOINT, type DetectedMatch, MAX_API_ENDPOINT_LENGTH, type MaterialActivityRequestPayload, MicrophoneMatcher, type MicrophoneMatcherActivityRefinementOptions, type MicrophoneMatcherActivityReporterOptions, type MicrophoneMatcherCampaignEvent, type MicrophoneMatcherEventMap, type MicrophoneMatcherEventName, type MicrophoneMatcherListener, authenticateAndLoadAudioPack, createLocalStorageAudioPackStore, createLocalStorageSessionManager, createMicrophoneMatcher, requestMicrophoneStream };
+export { ACTIVITY_REFINEMENT_WINDOW_MS, type ActivityRefinementFailureContext, type ActivityRefinementRequestContext, type AudioMarkerEvent, type AudioMarkerIdentity, AudioRecognizer, type AudioRecognizerAuthOptions, type AudioRecognizerOptions, type AuthenticateAndLoadAudioPackOptions, type AuthenticateAndLoadAudioPackResult, type BrowserAudioPackLoader, type BrowserAudioPackState, type BrowserAudioPackStateStore, type BrowserSessionManager, type CreateLocalStorageAudioPackStoreOptions, type CreateLocalStorageSessionManagerOptions, type CreateMicrophoneMatcherOptions, type CreateMicrophoneMatcherWasmOptions, DEFAULT_BROWSER_AUDIOPACK_VERSION, DEFAULT_SORI_API_ENDPOINT, type DetectedMatch, MAX_API_ENDPOINT_LENGTH, type MaterialActivityRequestPayload, MicrophoneMatcher, type MicrophoneMatcherActivityRefinementOptions, type MicrophoneMatcherActivityReporterOptions, type MicrophoneMatcherCampaignEvent, type MicrophoneMatcherEventMap, type MicrophoneMatcherEventName, type MicrophoneMatcherListener, authenticateAndLoadAudioPack, createLocalStorageAudioPackStore, createLocalStorageSessionManager, createMicrophoneMatcher, requestMicrophoneStream };

package/dist/index.js

@@ -354,6 +354,15 @@ var FingerprintMatchWindow = class {
   }
 };
 
+// src/activity-refinement.ts
+import { MATCH_CONTINUITY_GAP_MS } from "@sorisdk/matcher";
+
+// src/detected-match.ts
+function toPublicDetectedMatch(match) {
+  const { audioMarker: _internalAudioMarker, ...publicMatch } = match;
+  return publicMatch;
+}
+
 // src/activity.ts
 var ActivityReportingError = class extends Error {
   status;
@@ -417,7 +426,7 @@ function validateRequestPayload(payload) {
 }
 async function resolveCreateRequestPayload(reporter, match) {
   const payload = validateRequestPayload(
-    reporter.mapMatchToRequest ? await reporter.mapMatchToRequest(match) : defaultRequestPayload(match)
+    reporter.mapMatchToRequest ? await reporter.mapMatchToRequest(toPublicDetectedMatch(match)) : defaultRequestPayload(match)
   );
   if (!payload) {
     return null;
@@ -428,7 +437,7 @@ async function resolveCreateRequestPayload(reporter, match) {
     refinement_expected: _ignoredRefinementExpected,
     ...requestPayload
   } = payload;
-  return requestPayload;
+  return withInternalAudioMarker(requestPayload, match);
 }
 async function resolveRefineRequestPayload(reporter, match, context) {
   const refinement = reporter.refinement;
@@ -436,7 +445,7 @@ async function resolveRefineRequestPayload(reporter, match, context) {
     return null;
   }
   const payload = validateRequestPayload(
-    refinement.mapMatchToRequest ? await refinement.mapMatchToRequest(match, context) : reporter.mapMatchToRequest ? await reporter.mapMatchToRequest(match) : defaultRequestPayload(match)
+    refinement.mapMatchToRequest ? await refinement.mapMatchToRequest(toPublicDetectedMatch(match), context) : reporter.mapMatchToRequest ? await reporter.mapMatchToRequest(toPublicDetectedMatch(match)) : defaultRequestPayload(match)
   );
   if (!payload) {
     return null;
@@ -447,7 +456,20 @@ async function resolveRefineRequestPayload(reporter, match, context) {
     refinement_expected: _ignoredRefinementExpected,
     ...requestPayload
   } = payload;
-  return requestPayload;
+  return withInternalAudioMarker(requestPayload, match);
+}
+function withInternalAudioMarker(payload, match) {
+  const marker = match.audioMarker?.code;
+  if (typeof marker !== "string" || marker.length === 0) {
+    return payload;
+  }
+  return {
+    ...payload,
+    trait: {
+      ...payload.trait,
+      marker
+    }
+  };
 }
 function defaultCampaignMapper(payload, match) {
   const campaign = payload.campaign;
@@ -455,12 +477,23 @@ function defaultCampaignMapper(payload, match) {
     return null;
   }
   return {
-    match,
+    match: toPublicDetectedMatch(match),
     campaign,
     activityId: typeof payload.activity_id === "string" ? payload.activity_id : null,
     raw: payload
   };
 }
+function resolvedAudioMarker(payload) {
+  if (!payload) {
+    return null;
+  }
+  const id = payload.audio_marker_id;
+  const name = payload.audio_marker_name;
+  if (typeof id !== "string" || id.trim().length === 0 || typeof name !== "string" || name.trim().length === 0) {
+    return null;
+  }
+  return Object.freeze({ id, name });
+}
 async function resolveHeaders(reporter, refinement = false) {
   const refinementHeaders = reporter.refinement && reporter.refinement.headers;
   const baseHeaders = reporter.headers ? typeof reporter.headers === "function" ? await reporter.headers() : reporter.headers : void 0;
@@ -518,17 +551,28 @@ async function mapCreateResponse(reporter, data, match, refinementExpected) {
   if (!data) {
     return {
       activityId: null,
+      audioMarker: null,
       campaign: null,
       creationAttempted: true,
       refinementExpected
     };
   }
-  const campaign = reporter.mapResponseToCampaign ? await reporter.mapResponseToCampaign(data, match) : defaultCampaignMapper(data, match);
+  const audioMarker = resolvedAudioMarker(data);
+  let campaign;
+  let campaignMappingFailure;
+  try {
+    campaign = reporter.mapResponseToCampaign ? await reporter.mapResponseToCampaign(data, toPublicDetectedMatch(match)) : defaultCampaignMapper(data, match);
+  } catch (error) {
+    campaign = null;
+    campaignMappingFailure = { error };
+  }
   return {
     activityId: responseActivityId(data, campaign),
+    audioMarker,
     campaign,
     creationAttempted: true,
-    refinementExpected
+    refinementExpected,
+    ...campaignMappingFailure ? { campaignMappingFailure } : {}
   };
 }
 async function resolveRefinementEndpoint(reporter, activityId) {
@@ -544,6 +588,7 @@ async function createMatchedMaterialActivity(reporter, match, refinementExpected
   if (!payload) {
     return {
       activityId: null,
+      audioMarker: null,
       campaign: null,
       creationAttempted: false,
       refinementExpected: false
@@ -576,11 +621,11 @@ async function createMatchedMaterialActivity(reporter, match, refinementExpected
 async function refineMatchedMaterialActivity(reporter, match, context, isActive = () => true) {
   const refinement = reporter.refinement;
   if (!refinement) {
-    return { activityId: null, campaign: null };
+    return { activityId: null, audioMarker: null, campaign: null };
   }
   const payload = await resolveRefineRequestPayload(reporter, match, context);
   if (!payload) {
-    return { activityId: null, campaign: null };
+    return { activityId: null, audioMarker: null, campaign: null };
   }
   const endpoint = await resolveRefinementEndpoint(reporter, context.activityId);
   const headers = await resolveHeaders(reporter, true);
@@ -596,8 +641,16 @@ async function refineMatchedMaterialActivity(reporter, match, context, isActive
   if (!data) {
     throw new ActivityReportingError("Activity refine failed: empty response", response.status);
   }
-  const mappedCampaign = refinement.mapResponseToCampaign ? await refinement.mapResponseToCampaign(data, match, context) : reporter.mapResponseToCampaign ? await reporter.mapResponseToCampaign(data, match) : defaultCampaignMapper(data, match);
-  const activityId = responseActivityId(data, mappedCampaign);
+  const audioMarker = resolvedAudioMarker(data);
+  let mappedCampaign;
+  let campaignMappingFailure;
+  try {
+    mappedCampaign = refinement.mapResponseToCampaign ? await refinement.mapResponseToCampaign(data, toPublicDetectedMatch(match), context) : reporter.mapResponseToCampaign ? await reporter.mapResponseToCampaign(data, toPublicDetectedMatch(match)) : defaultCampaignMapper(data, match);
+  } catch (error) {
+    mappedCampaign = null;
+    campaignMappingFailure = { error };
+  }
+  const activityId = responseActivityId(data, mappedCampaign) ?? (campaignMappingFailure ? context.activityId : null);
   if (activityId !== context.activityId) {
     throw new ActivityReportingError(
       "Activity refine failed: response activity_id does not match the requested activity",
@@ -605,12 +658,16 @@ async function refineMatchedMaterialActivity(reporter, match, context, isActive
     );
   }
   const campaign = mappedCampaign ? { ...mappedCampaign, activityId: context.activityId } : null;
-  return { activityId, campaign };
+  return {
+    activityId,
+    audioMarker,
+    campaign,
+    ...campaignMappingFailure ? { campaignMappingFailure } : {}
+  };
 }
 
 // src/activity-refinement.ts
 var ACTIVITY_REFINEMENT_WINDOW_MS = 3e4;
-var ACTIVITY_CONTINUITY_GAP_MS = 3e4;
 var DEFAULT_MAX_REFINEMENT_ATTEMPTS = 2;
 var MAX_REFINEMENT_ATTEMPTS = 10;
 function normalizeError(error) {
@@ -634,6 +691,7 @@ var ActivityRefinementCoordinator = class {
   registeredRequests = /* @__PURE__ */ new Set();
   settledRequests = /* @__PURE__ */ new Set();
   activeLifecycle = null;
+  activeMarkerSegment = null;
   generation = 0;
   constructor(reporter, callbacks) {
     this.reporter = reporter;
@@ -644,10 +702,14 @@ var ActivityRefinementCoordinator = class {
       this.registeredRequests.add(requestId);
     }
   }
-  report(recognitionId, match, captureGeneration, requestId = null) {
+  report(recognitionId, match, captureGeneration, requestId = null, distinct = true) {
     const coordinatorGeneration = this.generation;
+    const markerSegment = this.resolveMarkerSegment(match, captureGeneration);
     const hasMarker = typeof match.audioMarker?.code === "string" && match.audioMarker.code.length > 0;
     const refinement = this.reporter.refinement;
+    if (!refinement && !distinct) {
+      return;
+    }
     const requestCanRefine = requestId !== null && !this.settledRequests.has(requestId);
     const pendingMarker = requestId === null ? void 0 : this.pendingMarkers.get(requestId);
     if (requestId !== null) {
@@ -690,6 +752,7 @@ var ActivityRefinementCoordinator = class {
         activityId: null,
         markerMatch: hasMarker ? match : null,
         markerCode: hasMarker ? match.audioMarker?.code ?? null : null,
+        markerSegment,
         refinementTimer: null,
         continuityTimer: null,
         createSettled: false,
@@ -722,9 +785,15 @@ var ActivityRefinementCoordinator = class {
       recognitionTiming
     ).then(
       (result) => {
+        if (coordinatorGeneration === this.generation && result.audioMarker && this.callbacks.isCurrentCapture(captureGeneration)) {
+          this.emitResolvedAudioMarker(markerSegment, result.audioMarker);
+        }
         if (coordinatorGeneration === this.generation && result.campaign && this.callbacks.isCurrentCapture(captureGeneration)) {
           this.callbacks.emitCampaign(result.campaign);
         }
+        if (coordinatorGeneration === this.generation && result.campaignMappingFailure && this.callbacks.isCurrentCapture(captureGeneration)) {
+          this.callbacks.emitError("activity", result.campaignMappingFailure.error);
+        }
         if (coordinatorGeneration !== this.generation || !lifecycle || this.lifecycles.get(recognitionId) !== lifecycle) {
           return;
         }
@@ -803,6 +872,9 @@ var ActivityRefinementCoordinator = class {
     if (this.activeLifecycle?.captureGeneration === captureGeneration) {
       this.sealLifecycle(this.activeLifecycle);
     }
+    if (this.activeMarkerSegment?.captureGeneration === captureGeneration) {
+      this.activeMarkerSegment = null;
+    }
   }
   refine(recognitionId, marker, captureGeneration) {
     if (!this.reporter.refinement) {
@@ -841,6 +913,7 @@ var ActivityRefinementCoordinator = class {
     this.registeredRequests.clear();
     this.settledRequests.clear();
     this.activeLifecycle = null;
+    this.activeMarkerSegment = null;
   }
   startRefinement(lifecycle) {
     if (lifecycle.refinementStarted || lifecycle.refinementClosed || !lifecycle.activityId || !lifecycle.markerMatch) {
@@ -901,9 +974,18 @@ var ActivityRefinementCoordinator = class {
           return;
         }
         this.closeRefinement(lifecycle);
+        if (result.audioMarker) {
+          this.emitResolvedAudioMarker(lifecycle.markerSegment, result.audioMarker);
+        }
         if (result.campaign) {
           this.callbacks.emitCampaign(result.campaign);
         }
+        if (result.campaignMappingFailure) {
+          this.callbacks.emitError(
+            "activity-refinement",
+            result.campaignMappingFailure.error
+          );
+        }
         return;
       } catch (caught) {
         if (caught instanceof ActivityReportingCancelledError) {
@@ -977,7 +1059,31 @@ var ActivityRefinementCoordinator = class {
     }
   }
   isContinuousMatch(lifecycle, match, captureGeneration, now) {
-    return !lifecycle.sealed && this.activeLifecycle === lifecycle && lifecycle.captureGeneration === captureGeneration && lifecycle.match.name === match.name && lifecycle.match.afpType === match.afpType && this.isTransportActive(lifecycle) && now - lifecycle.lastObservedAt <= ACTIVITY_CONTINUITY_GAP_MS;
+    return !lifecycle.sealed && this.activeLifecycle === lifecycle && lifecycle.captureGeneration === captureGeneration && lifecycle.match.name === match.name && lifecycle.match.afpType === match.afpType && this.isTransportActive(lifecycle) && now - lifecycle.lastObservedAt <= MATCH_CONTINUITY_GAP_MS;
+  }
+  resolveMarkerSegment(match, captureGeneration) {
+    const now = this.now();
+    const active = this.activeMarkerSegment;
+    if (active && active.captureGeneration === captureGeneration && active.materialName === match.name && active.afpType === match.afpType && now - active.lastObservedAt <= MATCH_CONTINUITY_GAP_MS) {
+      active.lastObservedAt = now;
+      return active;
+    }
+    const segment = {
+      captureGeneration,
+      materialName: match.name,
+      afpType: match.afpType,
+      lastObservedAt: now,
+      emitted: false
+    };
+    this.activeMarkerSegment = segment;
+    return segment;
+  }
+  emitResolvedAudioMarker(segment, marker) {
+    if (segment.emitted) {
+      return;
+    }
+    segment.emitted = true;
+    this.callbacks.emitAudioMarker(Object.freeze({ marker }));
   }
   renewContinuity(lifecycle, now) {
     lifecycle.lastObservedAt = now;
@@ -987,14 +1093,14 @@ var ActivityRefinementCoordinator = class {
     if (lifecycle.continuityTimer) {
       clearTimeout(lifecycle.continuityTimer);
     }
-    const remainingMs = lifecycle.lastObservedAt + ACTIVITY_CONTINUITY_GAP_MS - this.now();
+    const remainingMs = lifecycle.lastObservedAt + MATCH_CONTINUITY_GAP_MS - this.now();
     lifecycle.continuityTimer = setTimeout(() => {
       lifecycle.continuityTimer = null;
       if (this.activeLifecycle !== lifecycle || lifecycle.sealed) {
         return;
       }
       const now = this.now();
-      if (now - lifecycle.lastObservedAt <= ACTIVITY_CONTINUITY_GAP_MS) {
+      if (now - lifecycle.lastObservedAt <= MATCH_CONTINUITY_GAP_MS) {
         this.scheduleContinuityExpiry(lifecycle);
         return;
       }
@@ -1225,7 +1331,6 @@ var MicrophoneMatcher = class {
   markerPcmBuffer = new Float32Array(0);
   resampleBuffer = new Float32Array(0);
   resampleOffset = 0;
-  latestAudioMarker = null;
   latestAudioMarkerDetection = null;
   audioMarkerRequestId = 0;
   activityRecognitionId = 0;
@@ -1252,6 +1357,7 @@ var MicrophoneMatcher = class {
     this.packSource = options.packSource;
     this.activityRefinement = options.activityReporter ? new ActivityRefinementCoordinator(options.activityReporter, {
       isCurrentCapture: (captureGeneration) => captureGeneration === this.captureGeneration && this.running,
+      emitAudioMarker: (event) => this.events.emit("audiomarker", event),
       emitCampaign: (campaign) => this.events.emit("campaign", campaign),
       emitError: (phase, error) => emitError(this.events, phase, error)
     }) : null;
@@ -1280,6 +1386,7 @@ var MicrophoneMatcher = class {
       }
       await this.matcherSession.loadPack(target);
       this.loadedPack = true;
+      await this.resetCaptureState();
     } catch (error) {
       emitAndThrow(this.events, "loadPack", error);
     }
@@ -1321,6 +1428,7 @@ var MicrophoneMatcher = class {
       this.ensureNotDestroyed();
       await this.prepare();
       await this.matcherSession.addEntry(name, afpType, fingerprint);
+      await this.resetCaptureState();
     } catch (error) {
       emitAndThrow(this.events, "addEntry", error);
     }
@@ -1330,6 +1438,7 @@ var MicrophoneMatcher = class {
       this.ensureNotDestroyed();
       await this.prepare();
       await this.matcherSession.addOrReplace(name, afpType, fingerprint);
+      await this.resetCaptureState();
     } catch (error) {
       emitAndThrow(this.events, "addOrReplace", error);
     }
@@ -1338,9 +1447,8 @@ var MicrophoneMatcher = class {
     try {
       this.ensureNotDestroyed();
       await this.prepare();
-      this.activityRefinement?.reset();
-      this.matchWindowOrThrow().reset();
       await this.matcherSession.clear();
+      await this.resetCaptureState();
     } catch (error) {
       emitAndThrow(this.events, "clear", error);
     }
@@ -1385,9 +1493,9 @@ var MicrophoneMatcher = class {
         return;
       }
       this.running = false;
+      await this.resetCaptureState();
       await this.graphController?.stop();
       this.graphController = null;
-      await this.resetCaptureState();
       if (this.stopTracksOnStop) {
         this.stream?.getTracks().forEach((track) => track.stop());
       }
@@ -1477,15 +1585,18 @@ var MicrophoneMatcher = class {
         let matchedBest = null;
         let shouldEmitNoMatch = false;
         let audioMarkerRequestId = null;
-        let associatedActivity = false;
+        let observedBest = null;
         const handleMatch = (event) => {
-          if (!event.best) {
+          if (!event.best || captureGeneration !== this.captureGeneration || !this.running) {
             return;
           }
           matchedBest = event.best;
           shouldEmitNoMatch = false;
         };
         const handleNoMatch = () => {
+          if (captureGeneration !== this.captureGeneration || !this.running) {
+            return;
+          }
           matchedBest = null;
           shouldEmitNoMatch = true;
         };
@@ -1495,7 +1606,6 @@ var MicrophoneMatcher = class {
           this.diagnostics.matchRequests += 1;
           const bestMatchPromise = this.matcherSession.bestMatch(query, this.matchConfig());
           audioMarkerRequestId = this.beginAudioMarkerDetection(captureGeneration);
-          let observedBest;
           try {
             observedBest = await bestMatchPromise;
           } catch (error) {
@@ -1504,15 +1614,10 @@ var MicrophoneMatcher = class {
             }
             throw error;
           }
-          if (audioMarkerRequestId !== null) {
-            associatedActivity = this.activityRefinement?.associate(
-              audioMarkerRequestId,
-              observedBest,
-              captureGeneration
-            ) ?? false;
+          if (captureGeneration !== this.captureGeneration || !this.running) {
+            return;
           }
-          const distinctBest = this.withAudioMarkerForRequest(matchedBest, audioMarkerRequestId);
-          matchedBest = distinctBest;
+          observedBest = this.withAudioMarkerForRequest(observedBest, audioMarkerRequestId);
         } finally {
           this.matcherSession.off("match", handleMatch);
           this.matcherSession.off("nomatch", handleNoMatch);
@@ -1520,44 +1625,56 @@ var MicrophoneMatcher = class {
         if (captureGeneration !== this.captureGeneration || !this.running) {
           return;
         }
-        if (matchedBest) {
-          this.events.emit("match", { best: matchedBest });
+        if (observedBest) {
+          const distinct = matchedBest !== null;
+          if (distinct) {
+            this.activityRefinement?.clearActive(captureGeneration);
+            this.events.emit("match", { best: toPublicDetectedMatch(observedBest) });
+          }
+          if (captureGeneration !== this.captureGeneration || !this.running) {
+            return;
+          }
           this.activityRecognitionId += 1;
           this.reportCampaign(
             this.activityRecognitionId,
-            matchedBest,
+            observedBest,
             captureGeneration,
-            audioMarkerRequestId
+            audioMarkerRequestId,
+            distinct
           );
-        } else if (shouldEmitNoMatch) {
-          if (audioMarkerRequestId !== null && !associatedActivity) {
+        } else {
+          if (audioMarkerRequestId !== null) {
             this.activityRefinement?.discardRequest(audioMarkerRequestId);
           }
-          this.activityRefinement?.clearActive(captureGeneration);
-          this.events.emit("nomatch", {});
-        } else if (audioMarkerRequestId !== null && !associatedActivity) {
-          this.activityRefinement?.discardRequest(audioMarkerRequestId);
+          if (shouldEmitNoMatch) {
+            this.activityRefinement?.clearActive(captureGeneration);
+            this.events.emit("nomatch", {});
+          }
         }
       } while (this.pendingMatch || this.matchWindowOrThrow().hasReadyQuery());
     } catch (error) {
-      emitError(this.events, "match", error);
+      if (captureGeneration === this.captureGeneration && this.running) {
+        emitError(this.events, "match", error);
+      }
     } finally {
-      this.matchInFlight = false;
+      if (captureGeneration === this.captureGeneration) {
+        this.matchInFlight = false;
+      }
     }
   }
   async resetCaptureState() {
     this.captureGeneration += 1;
+    this.matcherSession.resetRecognitionState();
     this.pendingMatch = false;
     this.matchInFlight = false;
     this.pcmBuffer = new Float32Array(0);
     this.markerPcmBuffer = new Float32Array(0);
     this.resampleBuffer = new Float32Array(0);
     this.resampleOffset = 0;
-    this.latestAudioMarker = null;
     this.latestAudioMarkerDetection = null;
     this.audioMarkerRequestId += 1;
     this.activityRefinement?.reset();
-    this.matchWindowOrThrow().reset();
+    this.matchWindow?.reset();
     await this.extractor?.reset();
   }
   appendAudioMarkerSamples(samples) {
@@ -1589,12 +1706,13 @@ var MicrophoneMatcher = class {
         return null;
       }
       this.latestAudioMarkerDetection = { requestId, detection };
-      this.emitAudioMarkerIfChanged(detection);
       this.activityRefinement?.refine(requestId, detection, captureGeneration);
       return detection;
     } catch (error) {
-      this.activityRefinement?.settleRequest(requestId);
-      emitError(this.events, "audiomarker", error);
+      if (captureGeneration === this.captureGeneration && this.running) {
+        this.activityRefinement?.settleRequest(requestId);
+        emitError(this.events, "audiomarker", error);
+      }
       return null;
     }
   }
@@ -1616,14 +1734,6 @@ var MicrophoneMatcher = class {
       audioMarker: this.latestAudioMarkerDetection.detection
     };
   }
-  emitAudioMarkerIfChanged(detection) {
-    const marker = detection.code ?? null;
-    if (marker === this.latestAudioMarker) {
-      return;
-    }
-    this.latestAudioMarker = marker;
-    this.events.emit("audiomarker", { marker, detection });
-  }
   normalizeInputSamples(samples) {
     if (this.audioContext.sampleRate === TARGET_SAMPLE_RATE) {
       return samples;
@@ -1653,9 +1763,9 @@ var MicrophoneMatcher = class {
   }
   async cleanupAfterStartFailure() {
     this.running = false;
+    await this.resetCaptureState();
     await this.graphController?.stop();
     this.graphController = null;
-    await this.resetCaptureState();
     if (this.stopTracksOnStop) {
       this.stream?.getTracks().forEach((track) => track.stop());
     }
@@ -1686,7 +1796,7 @@ var MicrophoneMatcher = class {
     }
     return this.matchWindow;
   }
-  reportCampaign(recognitionId, match, captureGeneration, audioMarkerRequestId) {
+  reportCampaign(recognitionId, match, captureGeneration, audioMarkerRequestId, distinct) {
     const reporter = this.options.activityReporter;
     if (!reporter) {
       return;
@@ -1695,7 +1805,8 @@ var MicrophoneMatcher = class {
       recognitionId,
       match,
       captureGeneration,
-      audioMarkerRequestId
+      audioMarkerRequestId,
+      distinct
     );
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sorisdk/web-audio",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Web SDK for browser-based audio recognition with SORI API",
   "type": "module",
   "main": "./dist/index.js",
@@ -34,8 +34,8 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://docs.soriapi.com/ko/integration/web",
   "dependencies": {
-    "@sorisdk/matcher": "0.6.7",
-    "@sorisdk/afpgen": "0.6.7"
+    "@sorisdk/afpgen": "0.6.9",
+    "@sorisdk/matcher": "0.6.9"
   },
   "devDependencies": {
     "tsup": "^8.5.1",