@semiont/api-client 0.2.34-build.89 → 0.2.34-build.91

package/dist/index.d.ts

@@ -297,7 +297,7 @@ declare class SSEClient {
      * stream.close();
      * ```
      */
-    detectReferences(resourceId: ResourceUri, request: DetectReferencesStreamRequest, options?: SSERequestOptions): SSEStream;
+    detectReferences(resourceId: ResourceUri, request: DetectReferencesStreamRequest, options: SSERequestOptions): SSEStream;
     /**
      * Generate resource from annotation (streaming)
      *
@@ -335,7 +335,7 @@ declare class SSEClient {
      * stream.close();
      * ```
      */
-    generateResourceFromAnnotation(resourceId: ResourceUri, annotationId: AnnotationUri, request: GenerateResourceStreamRequest, options?: SSERequestOptions): SSEStream;
+    generateResourceFromAnnotation(resourceId: ResourceUri, annotationId: AnnotationUri, request: GenerateResourceStreamRequest, options: SSERequestOptions): SSEStream;
     /**
      * Detect highlights in a resource (streaming)
      *
@@ -371,7 +371,7 @@ declare class SSEClient {
      * stream.close();
      * ```
      */
-    detectHighlights(resourceId: ResourceUri, request?: DetectHighlightsStreamRequest, options?: SSERequestOptions): SSEStream;
+    detectHighlights(resourceId: ResourceUri, request: DetectHighlightsStreamRequest | undefined, options: SSERequestOptions): SSEStream;
     /**
      * Detect assessments in a resource (streaming)
      *
@@ -407,7 +407,7 @@ declare class SSEClient {
      * stream.close();
      * ```
      */
-    detectAssessments(resourceId: ResourceUri, request?: DetectAssessmentsStreamRequest, options?: SSERequestOptions): SSEStream;
+    detectAssessments(resourceId: ResourceUri, request: DetectAssessmentsStreamRequest | undefined, options: SSERequestOptions): SSEStream;
     /**
      * Detect comments in a resource (streaming)
      *
@@ -447,7 +447,7 @@ declare class SSEClient {
      * stream.close();
      * ```
      */
-    detectComments(resourceId: ResourceUri, request?: DetectCommentsStreamRequest, options?: SSERequestOptions): SSEStream;
+    detectComments(resourceId: ResourceUri, request: DetectCommentsStreamRequest | undefined, options: SSERequestOptions): SSEStream;
     /**
      * Detect tags in a resource (streaming)
      *
@@ -488,7 +488,7 @@ declare class SSEClient {
      * stream.close();
      * ```
      */
-    detectTags(resourceId: ResourceUri, request: DetectTagsStreamRequest, options?: SSERequestOptions): SSEStream;
+    detectTags(resourceId: ResourceUri, request: DetectTagsStreamRequest, options: SSERequestOptions): SSEStream;
     /**
      * Subscribe to resource events (long-lived stream)
      *
@@ -523,7 +523,7 @@ declare class SSEClient {
      * stream.close();
      * ```
      */
-    resourceEvents(resourceId: ResourceUri, options?: SSERequestOptions & {
+    resourceEvents(resourceId: ResourceUri, options: SSERequestOptions & {
         onConnected?: () => void;
     }): SSEStream;
 }

package/dist/index.js

@@ -6,7 +6,6 @@ import { resourceUri } from '@semiont/core';
 // src/sse/stream.ts
 function createSSEStream(url, fetchOptions, config, logger) {
   const abortController = new AbortController();
-  const customHandlers = /* @__PURE__ */ new Map();
   let closed = false;
   const connect = async () => {
     try {
@@ -117,15 +116,14 @@ function createSSEStream(url, fetchOptions, config, logger) {
         event: eventType || "message",
         hasData: !!data
       });
-      if (config.customEventHandler) {
-        const handler = customHandlers.get(eventType);
-        if (handler) {
-          handler(parsed);
-          return;
-        }
+      if (typeof parsed === "object" && parsed !== null && "type" in parsed) {
+        config.eventBus.get(eventType).next(parsed);
+        config.eventBus.get("make-meaning:event").next(parsed);
+      } else {
+        config.eventBus.get(eventType).next(parsed);
       }
-      if (config.eventBus && config.eventPrefix) {
-        if (config.progressEvents.includes(eventType)) {
+      if (config.eventPrefix) {
+        if (config.progressEvents.includes("*") || config.progressEvents.includes(eventType)) {
           config.eventBus.get(`${config.eventPrefix}:progress`).next(parsed);
         }
         if (config.completeEvent && eventType === config.completeEvent) {
@@ -149,10 +147,6 @@ function createSSEStream(url, fetchOptions, config, logger) {
   return {
     close() {
       abortController.abort();
-    },
-    // Internal method for custom event handlers (used by resourceEvents)
-    on(event, callback) {
-      customHandlers.set(event, callback);
     }
   };
 }
@@ -230,14 +224,14 @@ var SSEClient = class {
       url,
       {
         method: "POST",
-        headers: this.getHeaders(options?.auth),
+        headers: this.getHeaders(options.auth),
         body: JSON.stringify(request)
       },
       {
-        progressEvents: ["reference-detection-started", "reference-detection-progress"],
-        completeEvent: "reference-detection-complete",
-        errorEvent: "reference-detection-error",
-        eventBus: options?.eventBus,
+        progressEvents: ["detection:started", "detection:progress"],
+        completeEvent: "detection:complete",
+        errorEvent: "detection:failed",
+        eventBus: options.eventBus,
         eventPrefix: "detection"
       },
       this.logger
@@ -288,14 +282,14 @@ var SSEClient = class {
       url,
       {
         method: "POST",
-        headers: this.getHeaders(options?.auth),
+        headers: this.getHeaders(options.auth),
         body: JSON.stringify(request)
       },
       {
-        progressEvents: ["generation-started", "generation-progress"],
-        completeEvent: "generation-complete",
-        errorEvent: "generation-error",
-        eventBus: options?.eventBus,
+        progressEvents: ["generation:started", "generation:progress"],
+        completeEvent: "generation:complete",
+        errorEvent: "generation:failed",
+        eventBus: options.eventBus,
         eventPrefix: "generation"
       },
       this.logger
@@ -343,14 +337,14 @@ var SSEClient = class {
       url,
       {
         method: "POST",
-        headers: this.getHeaders(options?.auth),
+        headers: this.getHeaders(options.auth),
         body: JSON.stringify(request)
       },
       {
-        progressEvents: ["highlight-detection-started", "highlight-detection-progress"],
-        completeEvent: "highlight-detection-complete",
-        errorEvent: "highlight-detection-error",
-        eventBus: options?.eventBus,
+        progressEvents: ["detection:started", "detection:progress"],
+        completeEvent: "detection:complete",
+        errorEvent: "detection:failed",
+        eventBus: options.eventBus,
         eventPrefix: "detection"
       },
       this.logger
@@ -398,14 +392,14 @@ var SSEClient = class {
       url,
       {
         method: "POST",
-        headers: this.getHeaders(options?.auth),
+        headers: this.getHeaders(options.auth),
         body: JSON.stringify(request)
       },
       {
-        progressEvents: ["assessment-detection-started", "assessment-detection-progress"],
-        completeEvent: "assessment-detection-complete",
-        errorEvent: "assessment-detection-error",
-        eventBus: options?.eventBus,
+        progressEvents: ["detection:started", "detection:progress"],
+        completeEvent: "detection:complete",
+        errorEvent: "detection:failed",
+        eventBus: options.eventBus,
         eventPrefix: "detection"
       },
       this.logger
@@ -457,14 +451,14 @@ var SSEClient = class {
       url,
       {
         method: "POST",
-        headers: this.getHeaders(options?.auth),
+        headers: this.getHeaders(options.auth),
         body: JSON.stringify(request)
       },
       {
-        progressEvents: ["comment-detection-started", "comment-detection-progress"],
-        completeEvent: "comment-detection-complete",
-        errorEvent: "comment-detection-error",
-        eventBus: options?.eventBus,
+        progressEvents: ["detection:started", "detection:progress"],
+        completeEvent: "detection:complete",
+        errorEvent: "detection:failed",
+        eventBus: options.eventBus,
         eventPrefix: "detection"
       },
       this.logger
@@ -517,14 +511,14 @@ var SSEClient = class {
       url,
       {
         method: "POST",
-        headers: this.getHeaders(options?.auth),
+        headers: this.getHeaders(options.auth),
         body: JSON.stringify(request)
       },
       {
-        progressEvents: ["tag-detection-started", "tag-detection-progress"],
-        completeEvent: "tag-detection-complete",
-        errorEvent: "tag-detection-error",
-        eventBus: options?.eventBus,
+        progressEvents: ["detection:started", "detection:progress"],
+        completeEvent: "detection:complete",
+        errorEvent: "detection:failed",
+        eventBus: options.eventBus,
         eventPrefix: "detection"
       },
       this.logger
@@ -571,24 +565,23 @@ var SSEClient = class {
       url,
       {
         method: "GET",
-        headers: this.getHeaders(options?.auth)
+        headers: this.getHeaders(options.auth)
       },
       {
         progressEvents: ["*"],
-        // Accept all event types
+        // Accept all event types (long-lived stream)
         completeEvent: null,
-        // Long-lived stream - no completion
-        errorEvent: "error",
-        // Generic error event
-        customEventHandler: true
-        // Use custom event handling
+        // Never completes (long-lived)
+        errorEvent: null,
+        // No error event (errors throw)
+        eventBus: options.eventBus
       },
       this.logger
     );
-    if (options?.onConnected) {
-      stream.on?.("stream-connected", options.onConnected);
-    } else {
-      stream.on?.("stream-connected", () => {
+    if (options.onConnected) {
+      const sub = options.eventBus.get("stream-connected").subscribe(() => {
+        options.onConnected();
+        sub.unsubscribe();
       });
     }
     return stream;
@@ -1723,7 +1716,6 @@ function validateAndCorrectOffsets(content, aiStart, aiEnd, exact) {
   const exactPreview = exact.length > 50 ? exact.substring(0, 50) + "..." : exact;
   const textAtOffset = content.substring(aiStart, aiEnd);
   if (textAtOffset === exact) {
-    console.log(`[validateAndCorrectOffsets] \u2713 Offsets correct for: "${exactPreview}"`);
     const context2 = extractContext(content, aiStart, aiEnd);
     return {
       start: aiStart,