action-lens 1.0.53 → 1.0.55

package/dist/index.d.mts

@@ -44,9 +44,9 @@ declare class ActionLensPlayer {
 
 declare class ActionLensRc {
     sessionId: string;
-    stopFnForStore: any | null;
+    stopFnForStore: any;
     userId: string | null;
-    db: Firestore;
+    db: Firestore | null;
     prefix: string;
     userData: User | null;
     projectId: string | null;
@@ -59,7 +59,6 @@ declare class ActionLensRc {
     };
     metaData: Record<string, any>;
     constructor();
-    private retryOperation;
     init(_userId: string | null, projectId: string | null, userMeta: {
         name: string;
         email: string;

package/dist/index.d.ts

@@ -44,9 +44,9 @@ declare class ActionLensPlayer {
 
 declare class ActionLensRc {
     sessionId: string;
-    stopFnForStore: any | null;
+    stopFnForStore: any;
     userId: string | null;
-    db: Firestore;
+    db: Firestore | null;
     prefix: string;
     userData: User | null;
     projectId: string | null;
@@ -59,7 +59,6 @@ declare class ActionLensRc {
     };
     metaData: Record<string, any>;
     constructor();
-    private retryOperation;
     init(_userId: string | null, projectId: string | null, userMeta: {
         name: string;
         email: string;

package/dist/index.js

@@ -332,160 +332,158 @@ var import_uuid = require("uuid");
 var import_rrweb2 = require("rrweb");
 var import_firestore3 = require("firebase/firestore");
 var import_packer2 = require("@rrweb/packer");
-var import_app2 = require("firebase/app");
 var ActionLensRc = class {
   sessionId = (0, import_uuid.v4)();
   stopFnForStore = null;
   userId = null;
-  db;
+  db = null;
   prefix = "";
   userData = null;
   projectId = null;
   projectData = null;
   organizationId = null;
   originalUserId = null;
+  // 元のユーザーID（外部システムのIDなど）
   userMeta = {};
   metaData = {};
   constructor() {
-    const app2 = (0, import_app2.initializeApp)(firebaseConfig);
-    this.db = (0, import_firestore3.getFirestore)(app2);
-    (0, import_firestore3.enableIndexedDbPersistence)(this.db).catch((err) => {
-      console.warn("Persistence error:", err.message);
-    });
-  }
-  async retryOperation(operation, maxAttempts = 3, delay = 1e3) {
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-      try {
-        return await operation();
-      } catch (error) {
-        if (attempt === maxAttempts) throw error;
-        console.warn(`Retry ${attempt}/${maxAttempts} failed:`, error);
-        await new Promise((resolve) => setTimeout(resolve, delay));
-      }
-    }
-    throw new Error("Retry operation failed");
+    this.db = db;
   }
   async init(_userId, projectId, userMeta, metaData = {}, _db = null, prefix = "") {
     try {
-      if (_db) {
-        this.db = _db;
-      }
-      if (!this.db) {
-        throw new Error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
-      }
       this.originalUserId = _userId;
       console.log("ActionLensRc\u958B\u59CB");
+      if (!projectId) {
+        console.error("projectId\u304CNULL\u3067\u3059");
+        throw new Error("projectId\u304CNULL\u3067\u3059");
+      }
       this.projectId = projectId;
       this.prefix = prefix;
       this.userMeta = userMeta;
       this.metaData = metaData;
       if (!_userId) {
+        console.error("userId\u304CNULL\u3067\u3059");
         throw new Error("userId\u304CNULL\u3067\u3059");
       }
+      if (!this.db && _db) {
+        console.error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+        this.db = _db;
+      }
+      if (!this.db) {
+        console.error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+        throw new Error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+      }
       if (!this.projectId) {
-        throw new Error("projectId\u304CNULL\u3067\u3059");
+        console.error("projectId\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+        throw new Error("projectId\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
       }
-      const projectDocRef = (0, import_firestore3.doc)(
-        (0, import_firestore3.collection)(this.db, `${this.prefix}project`),
-        this.projectId
+      const _doc = await (0, import_firestore3.getDoc)(
+        (0, import_firestore3.doc)((0, import_firestore3.collection)(this.db, `${this.prefix}project`), this.projectId)
       );
-      const projectDoc = await this.retryOperation(() => (0, import_firestore3.getDoc)(projectDocRef));
-      this.projectData = projectDoc.exists() ? projectDoc.data() : null;
+      this.projectData = _doc.data();
+      const projectData = this.projectData;
+      this.organizationId = projectData?.organizationId || "";
       if (!this.projectData) {
-        await this.retryOperation(
-          () => (0, import_firestore3.setDoc)(
-            projectDocRef,
-            {
-              id: this.projectId,
-              name: this.projectId,
-              organizationId: "",
-              isActivate: false,
-              createAt: /* @__PURE__ */ new Date(),
-              updateAt: /* @__PURE__ */ new Date(),
-              createdBy: this.originalUserId,
-              updatedBy: this.originalUserId
-            },
-            { merge: true }
-          )
+        await (0, import_firestore3.setDoc)(
+          (0, import_firestore3.doc)((0, import_firestore3.collection)(this.db, `${this.prefix}project`), this.projectId),
+          {
+            id: this.projectId,
+            name: this.projectId,
+            organizationId: "",
+            isActivate: false,
+            // デフォルトでアクティブに設定
+            createAt: /* @__PURE__ */ new Date(),
+            updateAt: /* @__PURE__ */ new Date(),
+            createdBy: this.originalUserId,
+            updatedBy: this.originalUserId
+          },
+          { merge: true }
         );
         throw new Error("\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093");
       }
-      if (!this.projectData.isActivate) {
+      if (!this.projectData?.isActivate) {
+        console.warn("\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u975E\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u3059\u3002\u9332\u753B\u3092\u958B\u59CB\u3067\u304D\u307E\u305B\u3093\u3002");
         throw new Error(
           "\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u975E\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u3059\u3002\u9332\u753B\u3092\u958B\u59CB\u3067\u304D\u307E\u305B\u3093\u3002"
         );
       }
-      this.organizationId = this.projectData.organizationId || "";
-      this.userId = `${this.projectData.organizationId}-${this.originalUserId}`;
-      const userDocRef = (0, import_firestore3.doc)(
-        (0, import_firestore3.collection)(this.db, `${this.prefix}user`),
-        this.userId
+      this.userId = projectData.organizationId + "-" + this.originalUserId;
+      this.prefix = this.prefix;
+      this.projectId = this.projectId;
+      const user = await (0, import_firestore3.getDoc)(
+        (0, import_firestore3.doc)((0, import_firestore3.collection)(this.db, `${this.prefix}user`), this.userId)
       );
-      const userDoc = await this.retryOperation(() => (0, import_firestore3.getDoc)(userDocRef));
-      this.userData = userDoc.exists() ? userDoc.data() : null;
-      if (!this.userData || !userDoc.exists()) {
-        await this.retryOperation(
-          () => (0, import_firestore3.setDoc)(
-            userDocRef,
+      if (!this.db) {
+        console.error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+        throw new Error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+      }
+      const userData = user.data();
+      if (!userData.id || !user.exists()) {
+        await (0, import_firestore3.setDoc)(
+          (0, import_firestore3.doc)(
+            (0, import_firestore3.collection)(this.db, `${this.prefix}user`),
+            projectData.organizationId + "-" + this.originalUserId
+          ),
+          {
+            ...this.userMeta || {},
+            metaData: this.metaData,
+            id: this.userId,
+            originalUserId: this.originalUserId,
+            type: "customer",
+            organizationId: projectData?.organizationId || "",
+            projectIds: [this.projectId],
+            createAt: /* @__PURE__ */ new Date(),
+            updateAt: /* @__PURE__ */ new Date(),
+            createdBy: this.userId,
+            updatedBy: this.userId,
+            hidden: false,
+            hiddenBy: ""
+          },
+          { merge: true }
+        );
+        this.userData = user.data();
+      } else {
+        this.userData = user.data();
+        if (!this.userData?.projectIds?.includes(this.projectId || "")) {
+          await (0, import_firestore3.setDoc)(
+            (0, import_firestore3.doc)(
+              (0, import_firestore3.collection)(this.db, `${this.prefix}user`),
+              projectData.organizationId + "-" + this.originalUserId
+            ),
             {
-              ...this.userMeta,
-              metaData: this.metaData,
-              id: this.userId,
-              originalUserId: this.originalUserId,
-              type: "customer",
-              organizationId: this.projectData?.organizationId || "",
-              projectIds: [this.projectId],
-              createAt: /* @__PURE__ */ new Date(),
+              projectIds: [
+                ...this.userData?.projectIds || [],
+                this.projectId
+              ],
               updateAt: /* @__PURE__ */ new Date(),
-              createdBy: this.userId,
-              updatedBy: this.userId,
-              hidden: false,
-              hiddenBy: ""
+              updatedBy: this.userId
             },
             { merge: true }
-          )
-        );
-        const updatedUserDoc = await this.retryOperation(
-          () => (0, import_firestore3.getDoc)(userDocRef)
-        );
-        this.userData = updatedUserDoc.data();
-      } else {
-        if (!this.userData.projectIds?.includes(this.projectId)) {
-          await this.retryOperation(
-            () => (0, import_firestore3.setDoc)(
-              userDocRef,
-              {
-                projectIds: [
-                  ...this.userData?.projectIds || [],
-                  this.projectId
-                ],
-                updateAt: /* @__PURE__ */ new Date(),
-                updatedBy: this.userId
-              },
-              { merge: true }
-            )
           );
         }
-        if (this.userData.organizationId !== this.projectData.organizationId) {
-          await this.retryOperation(
-            () => (0, import_firestore3.setDoc)(
-              userDocRef,
-              {
-                organizationId: this.projectData?.organizationId || this.userData?.organizationId,
-                updateAt: /* @__PURE__ */ new Date(),
-                updatedBy: this.userId
-              },
-              { merge: true }
-            )
+        if (this.userData?.organizationId !== projectData.organizationId) {
+          await (0, import_firestore3.setDoc)(
+            (0, import_firestore3.doc)(
+              (0, import_firestore3.collection)(this.db, `${this.prefix}user`),
+              projectData.organizationId + "-" + this.originalUserId
+            ),
+            {
+              organizationId: projectData.organizationId ? projectData.organizationId : this.userData?.organizationId,
+              updateAt: /* @__PURE__ */ new Date(),
+              updatedBy: this.userId
+            },
+            { merge: true }
           );
         }
       }
       await this.startRrwebRecordingForStore();
+      return;
     } catch (error) {
       console.error("\u521D\u671F\u5316\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F:", error);
       throw error;
     }
   }
+  // コンソールログをキャプチャ
   startConsoleRecording() {
     try {
       const originalConsole = { ...console };
@@ -499,15 +497,8 @@ var ActionLensRc = class {
       ];
       consoleMethods.forEach((method) => {
         console[method] = (...args) => {
-          try {
-            originalConsole[method](...args);
-            import_rrweb2.record.addCustomEvent("console", { method, args });
-          } catch (error) {
-            originalConsole.error(
-              "\u30B3\u30F3\u30BD\u30FC\u30EB\u30A4\u30D9\u30F3\u30C8\u8A18\u9332\u30A8\u30E9\u30FC:",
-              error
-            );
-          }
+          originalConsole[method](...args);
+          import_rrweb2.record.addCustomEvent("console", { method: "log", args });
         };
       });
     } catch (error) {
@@ -515,39 +506,32 @@ var ActionLensRc = class {
       throw error;
     }
   }
+  // タイムライン（ナビゲーションとパフォーマンス）をキャプチャ
   startTimelineRecording() {
     try {
       const userId = this.userId || "unknown";
       const sessionId = this.sessionId;
       const db2 = this.db;
       const prefix = this.prefix;
-      if (!db2) {
-        console.error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
-        return;
-      }
       window.addEventListener("popstate", (event) => {
-        try {
-          import_rrweb2.record.addCustomEvent("navigation", {
-            url: window.location.href,
-            state: event.state
-          });
-        } catch (error) {
-          console.error("\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30A4\u30D9\u30F3\u30C8\u8A18\u9332\u30A8\u30E9\u30FC:", error);
+        if (!db2) {
+          console.error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+          return;
         }
+        import_rrweb2.record.addCustomEvent("navigation", {
+          url: window.location.href,
+          state: event.state
+        });
       });
       if (window.performance) {
         const observer = new PerformanceObserver((list) => {
           for (const entry of list.getEntries()) {
-            try {
-              import_rrweb2.record.addCustomEvent("performance", {
-                name: entry.name,
-                entryType: entry.entryType,
-                startTime: entry.startTime,
-                duration: entry.duration
-              });
-            } catch (error) {
-              console.error("\u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9\u30A4\u30D9\u30F3\u30C8\u8A18\u9332\u30A8\u30E9\u30FC:", error);
-            }
+            import_rrweb2.record.addCustomEvent("performance", {
+              name: entry.name,
+              entryType: entry.entryType,
+              startTime: entry.startTime,
+              duration: entry.duration
+            });
           }
         });
         observer.observe({ entryTypes: ["resource", "navigation", "paint"] });
@@ -566,27 +550,26 @@ var ActionLensRc = class {
       const db2 = this.db;
       const prefix = this.prefix;
       if (!db2) {
-        throw new Error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+        console.error("Firestore\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+        return;
       }
       const ActionRecordSessionRef = (0, import_firestore3.doc)(
         (0, import_firestore3.collection)(db2, `${prefix}ActionRecordSession`),
         _sessionId
       );
-      await this.retryOperation(
-        () => (0, import_firestore3.setDoc)(ActionRecordSessionRef, {
-          id: _sessionId,
-          startTime: /* @__PURE__ */ new Date(),
-          endTime: /* @__PURE__ */ new Date(),
-          userId,
-          projectId: this.projectId || "",
-          organizationId: this.projectData?.organizationId || "",
-          createAt: /* @__PURE__ */ new Date(),
-          updateAt: /* @__PURE__ */ new Date(),
-          createdBy: userId,
-          updatedBy: userId
-        }).then(() => console.log(`ActionRecordSession created: ${_sessionId}`))
-      );
-      const events = [];
+      await (0, import_firestore3.setDoc)(ActionRecordSessionRef, {
+        id: _sessionId,
+        startTime: /* @__PURE__ */ new Date(),
+        endTime: /* @__PURE__ */ new Date(),
+        userId,
+        projectId: this.projectId || "",
+        organizationId: this.projectData?.organizationId || "",
+        createAt: /* @__PURE__ */ new Date(),
+        updateAt: /* @__PURE__ */ new Date(),
+        createdBy: userId,
+        updatedBy: userId
+      });
+      const _updateActionRecordSession = async () => await this.updateActionRecordSession();
       this.stopFnForStore = (0, import_rrweb2.record)({
         packFn: import_packer2.pack,
         collectFonts: true,
@@ -614,38 +597,18 @@ var ActionLensRc = class {
               updatedBy: userId,
               hiddenBy: ""
             };
-            events.push(record2);
-            if (events.length >= 10) {
-              const batch = (0, import_firestore3.writeBatch)(db2);
-              events.forEach((evt) => {
-                const docRef = (0, import_firestore3.doc)(
-                  (0, import_firestore3.collection)(db2, `${prefix}ActionRecord`),
-                  evt.id
-                );
-                batch.set(docRef, evt);
-              });
-              await this.retryOperation(
-                () => batch.commit().then(
-                  () => console.log(
-                    `Batch write completed for ${events.length} events`
-                  )
-                )
-              );
-              events.length = 0;
-              await this.updateActionRecordSession();
-            }
+            await (0, import_firestore3.setDoc)(newDocRef, record2);
+            await _updateActionRecordSession();
           } catch (error) {
-            console.error(
-              `rrweb\u30A4\u30D9\u30F3\u30C8\u4FDD\u5B58\u30A8\u30E9\u30FC (sessionId: ${_sessionId}):`,
-              error
-            );
+            console.error("rrweb\u30A4\u30D9\u30F3\u30C8\u4FDD\u5B58\u30A8\u30E9\u30FC:", error);
+            throw error;
           }
         },
         recordCanvas: false
       });
       this.startConsoleRecording();
     } catch (error) {
-      console.error(`rrweb\u9332\u753B\u30A8\u30E9\u30FC (sessionId: ${this.sessionId}):`, error);
+      console.error("rrweb\u9332\u753B\u30A8\u30E9\u30FC:", error);
       throw error;
     }
   }
@@ -654,7 +617,6 @@ var ActionLensRc = class {
       if (this.stopFnForStore) {
         this.stopFnForStore();
         this.stopFnForStore = null;
-        console.log("rrweb\u9332\u753B\u3092\u505C\u6B62\u3057\u307E\u3057\u305F");
       }
     } catch (error) {
       console.error("rrweb\u9332\u753B\u505C\u6B62\u30A8\u30E9\u30FC:", error);
@@ -673,24 +635,19 @@ var ActionLensRc = class {
         (0, import_firestore3.collection)(this.db, `${this.prefix}ActionRecordSession`),
         this.sessionId
       );
-      await this.retryOperation(
-        () => (0, import_firestore3.setDoc)(
-          ActionRecordSessionRef,
-          {
-            endTime: /* @__PURE__ */ new Date(),
-            updateAt: /* @__PURE__ */ new Date(),
-            updatedBy: this.userId
-          },
-          { merge: true }
-        ).then(
-          () => console.log(`ActionRecordSession updated: ${this.sessionId}`)
-        )
-      );
+      await (0, import_firestore3.setDoc)(
+        ActionRecordSessionRef,
+        {
+          endTime: /* @__PURE__ */ new Date(),
+          updateAt: /* @__PURE__ */ new Date(),
+          updatedBy: this.userId
+        },
+        { merge: true }
+      ).catch((error) => {
+        console.error("Error updating ActionRecordSession: ", error);
+      });
     } catch (error) {
-      console.error(
-        `ActionRecordSession\u66F4\u65B0\u30A8\u30E9\u30FC (sessionId: ${this.sessionId}):`,
-        error
-      );
+      console.error("ActionRecordSession\u66F4\u65B0\u30A8\u30E9\u30FC:", error);
       throw error;
     }
   }