mixi2-js 1.2.0 → 1.2.1

package/dist/{client-BmF_2lFq.d.cts → client-iXbbRxc-.d.cts}

@@ -12,6 +12,7 @@ declare class OAuth2Authenticator implements Authenticator {
     private readonly tokenUrl;
     private accessToken;
     private expiresAt;
+    private refreshPromise;
     constructor(options: AuthenticatorOptions);
     getAccessToken(): Promise<string>;
     private refreshToken;

package/dist/{client-BmF_2lFq.d.ts → client-iXbbRxc-.d.ts}

@@ -12,6 +12,7 @@ declare class OAuth2Authenticator implements Authenticator {
     private readonly tokenUrl;
     private accessToken;
     private expiresAt;
+    private refreshPromise;
     constructor(options: AuthenticatorOptions);
     getAccessToken(): Promise<string>;
     private refreshToken;

package/dist/helpers/index.d.cts

@@ -1,4 +1,4 @@
-import { E as EventHandler, h as EventType, f as Event, c as Client, I as InitiatePostMediaUploadRequest, v as PostMask, D as PostPublishingType, e as CreatePostRequest, g as EventReason } from '../client-BmF_2lFq.cjs';
+import { E as EventHandler, h as EventType, f as Event, c as Client, I as InitiatePostMediaUploadRequest, v as PostMask, D as PostPublishingType, e as CreatePostRequest, g as EventReason } from '../client-iXbbRxc-.cjs';
 
 /**
  * アクセストークン取得用のエンドポイント URL です。

package/dist/helpers/index.d.ts

@@ -1,4 +1,4 @@
-import { E as EventHandler, h as EventType, f as Event, c as Client, I as InitiatePostMediaUploadRequest, v as PostMask, D as PostPublishingType, e as CreatePostRequest, g as EventReason } from '../client-BmF_2lFq.js';
+import { E as EventHandler, h as EventType, f as Event, c as Client, I as InitiatePostMediaUploadRequest, v as PostMask, D as PostPublishingType, e as CreatePostRequest, g as EventReason } from '../client-iXbbRxc-.js';
 
 /**
  * アクセストークン取得用のエンドポイント URL です。

package/dist/index.cjs

@@ -62,6 +62,7 @@ var OAuth2Authenticator = class {
   tokenUrl;
   accessToken = null;
   expiresAt = null;
+  refreshPromise = null;
   constructor(options) {
     this.clientId = options.clientId;
     this.clientSecret = options.clientSecret;
@@ -71,7 +72,12 @@ var OAuth2Authenticator = class {
     if (this.accessToken && this.expiresAt && Date.now() < this.expiresAt) {
       return this.accessToken;
     }
-    await this.refreshToken();
+    if (!this.refreshPromise) {
+      this.refreshPromise = this.refreshToken().finally(() => {
+        this.refreshPromise = null;
+      });
+    }
+    await this.refreshPromise;
     return this.accessToken;
   }
   async refreshToken() {
@@ -574,10 +580,8 @@ var WebhookServer = class {
       res.end("missing x-mixi2-application-event-signature");
       return;
     }
-    let signature;
-    try {
-      signature = Buffer.from(signatureBase64, "base64");
-    } catch {
+    const signature = Buffer.from(signatureBase64, "base64");
+    if (signature.length === 0) {
       res.writeHead(401);
       res.end("x-mixi2-application-event-signature is invalid");
       return;
@@ -754,7 +758,10 @@ var StreamWatcher = class {
             this.handleEvent(handler, event);
           }
         });
-        s.on("error", async () => {
+        let disconnected = false;
+        const handleDisconnect = async () => {
+          if (disconnected) return;
+          disconnected = true;
           if (this.aborted) {
             resolve();
             return;
@@ -765,10 +772,9 @@ var StreamWatcher = class {
           } catch (reconnectErr) {
             reject(reconnectErr);
           }
-        });
-        s.on("end", () => {
-          resolve();
-        });
+        };
+        s.on("error", handleDisconnect);
+        s.on("end", handleDisconnect);
       };
       setupStream(stream);
     });

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { E as EventHandler, A as Authenticator } from './client-BmF_2lFq.cjs';
-export { a as AuthenticatorOptions, C as ChatMessage, b as ChatMessageReceivedEvent, c as Client, d as ClientOptions, e as CreatePostRequest, f as Event, g as EventReason, h as EventType, G as GetPostMediaStatusResponse, i as GetStampsRequest, I as InitiatePostMediaUploadRequest, j as InitiatePostMediaUploadResponse, L as LanguageCode, M as Media, k as MediaImage, l as MediaStamp, m as MediaType, n as MediaUploadStatus, o as MediaUploadType, p as MediaVideo, O as OAuth2Authenticator, q as OfficialStamp, r as OfficialStampSet, P as PingEvent, s as Post, t as PostAccessLevel, u as PostCreatedEvent, v as PostMask, w as PostMaskType, x as PostMedia, y as PostMediaImage, z as PostMediaType, B as PostMediaVideo, D as PostPublishingType, F as PostStamp, H as PostVisibility, S as SendChatMessageRequest, J as StampSetType, U as User, K as UserAccessLevel, N as UserAvatar, Q as UserVisibility } from './client-BmF_2lFq.cjs';
+import { E as EventHandler, A as Authenticator } from './client-iXbbRxc-.cjs';
+export { a as AuthenticatorOptions, C as ChatMessage, b as ChatMessageReceivedEvent, c as Client, d as ClientOptions, e as CreatePostRequest, f as Event, g as EventReason, h as EventType, G as GetPostMediaStatusResponse, i as GetStampsRequest, I as InitiatePostMediaUploadRequest, j as InitiatePostMediaUploadResponse, L as LanguageCode, M as Media, k as MediaImage, l as MediaStamp, m as MediaType, n as MediaUploadStatus, o as MediaUploadType, p as MediaVideo, O as OAuth2Authenticator, q as OfficialStamp, r as OfficialStampSet, P as PingEvent, s as Post, t as PostAccessLevel, u as PostCreatedEvent, v as PostMask, w as PostMaskType, x as PostMedia, y as PostMediaImage, z as PostMediaType, B as PostMediaVideo, D as PostPublishingType, F as PostStamp, H as PostVisibility, S as SendChatMessageRequest, J as StampSetType, U as User, K as UserAccessLevel, N as UserAvatar, Q as UserVisibility } from './client-iXbbRxc-.cjs';
 import http from 'http';
 
 interface WebhookServerOptions {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { E as EventHandler, A as Authenticator } from './client-BmF_2lFq.js';
-export { a as AuthenticatorOptions, C as ChatMessage, b as ChatMessageReceivedEvent, c as Client, d as ClientOptions, e as CreatePostRequest, f as Event, g as EventReason, h as EventType, G as GetPostMediaStatusResponse, i as GetStampsRequest, I as InitiatePostMediaUploadRequest, j as InitiatePostMediaUploadResponse, L as LanguageCode, M as Media, k as MediaImage, l as MediaStamp, m as MediaType, n as MediaUploadStatus, o as MediaUploadType, p as MediaVideo, O as OAuth2Authenticator, q as OfficialStamp, r as OfficialStampSet, P as PingEvent, s as Post, t as PostAccessLevel, u as PostCreatedEvent, v as PostMask, w as PostMaskType, x as PostMedia, y as PostMediaImage, z as PostMediaType, B as PostMediaVideo, D as PostPublishingType, F as PostStamp, H as PostVisibility, S as SendChatMessageRequest, J as StampSetType, U as User, K as UserAccessLevel, N as UserAvatar, Q as UserVisibility } from './client-BmF_2lFq.js';
+import { E as EventHandler, A as Authenticator } from './client-iXbbRxc-.js';
+export { a as AuthenticatorOptions, C as ChatMessage, b as ChatMessageReceivedEvent, c as Client, d as ClientOptions, e as CreatePostRequest, f as Event, g as EventReason, h as EventType, G as GetPostMediaStatusResponse, i as GetStampsRequest, I as InitiatePostMediaUploadRequest, j as InitiatePostMediaUploadResponse, L as LanguageCode, M as Media, k as MediaImage, l as MediaStamp, m as MediaType, n as MediaUploadStatus, o as MediaUploadType, p as MediaVideo, O as OAuth2Authenticator, q as OfficialStamp, r as OfficialStampSet, P as PingEvent, s as Post, t as PostAccessLevel, u as PostCreatedEvent, v as PostMask, w as PostMaskType, x as PostMedia, y as PostMediaImage, z as PostMediaType, B as PostMediaVideo, D as PostPublishingType, F as PostStamp, H as PostVisibility, S as SendChatMessageRequest, J as StampSetType, U as User, K as UserAccessLevel, N as UserAvatar, Q as UserVisibility } from './client-iXbbRxc-.js';
 import http from 'http';
 
 interface WebhookServerOptions {

package/dist/index.js

@@ -22,6 +22,7 @@ var OAuth2Authenticator = class {
   tokenUrl;
   accessToken = null;
   expiresAt = null;
+  refreshPromise = null;
   constructor(options) {
     this.clientId = options.clientId;
     this.clientSecret = options.clientSecret;
@@ -31,7 +32,12 @@ var OAuth2Authenticator = class {
     if (this.accessToken && this.expiresAt && Date.now() < this.expiresAt) {
       return this.accessToken;
     }
-    await this.refreshToken();
+    if (!this.refreshPromise) {
+      this.refreshPromise = this.refreshToken().finally(() => {
+        this.refreshPromise = null;
+      });
+    }
+    await this.refreshPromise;
     return this.accessToken;
   }
   async refreshToken() {
@@ -443,10 +449,8 @@ var WebhookServer = class {
       res.end("missing x-mixi2-application-event-signature");
       return;
     }
-    let signature;
-    try {
-      signature = Buffer.from(signatureBase64, "base64");
-    } catch {
+    const signature = Buffer.from(signatureBase64, "base64");
+    if (signature.length === 0) {
       res.writeHead(401);
       res.end("x-mixi2-application-event-signature is invalid");
       return;
@@ -623,7 +627,10 @@ var StreamWatcher = class {
             this.handleEvent(handler, event);
           }
         });
-        s.on("error", async () => {
+        let disconnected = false;
+        const handleDisconnect = async () => {
+          if (disconnected) return;
+          disconnected = true;
           if (this.aborted) {
             resolve();
             return;
@@ -634,10 +641,9 @@ var StreamWatcher = class {
           } catch (reconnectErr) {
             reject(reconnectErr);
           }
-        });
-        s.on("end", () => {
-          resolve();
-        });
+        };
+        s.on("error", handleDisconnect);
+        s.on("end", handleDisconnect);
       };
       setupStream(stream);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixi2-js",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "TypeScript/JavaScript SDK for mixi2 Application API",
   "type": "module",
   "main": "./dist/index.cjs",