@cinerino/sdk 18.1.0-alpha.5 → 18.1.0-alpha.6

package/lib/abstract/transporters.d.ts

@@ -20,6 +20,7 @@ export declare class DefaultTransporter implements Transporter {
     /**
      * Default user agent.
      */
+    static readonly USER_AGENT: string;
     expectedStatusCodes: number[];
     constructor(expectedStatusCodes: number[]);
     /**

package/lib/abstract/transporters.js

@@ -8,9 +8,15 @@ exports.StubTransporter = exports.DefaultTransporter = exports.RequestError = ex
  * transporters
  */
 const debug_1 = __importDefault(require("debug"));
-// import fetch from 'isomorphic-fetch';
 const debug = (0, debug_1.default)('cinerino-sdk:transporters');
-// const pkg = require('../package.json');
+let version = 'unknown';
+try {
+    const pkg = require('../../package.json'); // eslint-disable-line @typescript-eslint/no-require-imports
+    version = pkg.version;
+}
+catch {
+    // 万が一ビルド後の配置で package.json が読めない場合のフォールバック
+}
 /**
  * トランスポーター抽象クラス
  */
@@ -36,7 +42,7 @@ class DefaultTransporter {
     /**
      * Default user agent.
      */
-    // public static readonly USER_AGENT: string = `cinerino-sdk/${pkg.version}`;
+    static USER_AGENT = `@cinerino/sdk/${version}`;
     expectedStatusCodes;
     constructor(expectedStatusCodes) {
         this.expectedStatusCodes = expectedStatusCodes;
@@ -45,14 +51,21 @@ class DefaultTransporter {
      * Configures request options before making a request.
      */
     static CONFIGURE(options) {
-        // set transporter user agent
-        // options.headers = (options.headers !== undefined) ? options.headers : {};
+        // ブラウザ環境では User-Agent の指定が拒否されるため、Node.js環境（サーバーサイド）でのみセットする
+        const isNode = typeof window === 'undefined' && typeof process !== 'undefined';
         /* istanbul ignore else */
-        // if (!(<any>options.headers)['User-Agent']) {
-        //     (<any>options.headers)['User-Agent'] = DefaultTransporter.USER_AGENT;
-        // } else if ((<any>options.headers)['User-Agent'].indexOf(DefaultTransporter.USER_AGENT) === -1) {
-        //     (<any>options.headers)['User-Agent'] = `${(<any>options.headers)['User-Agent']} ${DefaultTransporter.USER_AGENT}`;
-        // }
+        if (isNode) {
+            // Headers インスタンス化して大文字・小文字を吸収する
+            const headers = new Headers(options.headers);
+            const currentUserAgent = headers.get('user-agent');
+            if (!currentUserAgent) {
+                headers.set('user-agent', DefaultTransporter.USER_AGENT);
+            }
+            else if (!currentUserAgent.includes(DefaultTransporter.USER_AGENT)) {
+                headers.set('user-agent', `${currentUserAgent} ${DefaultTransporter.USER_AGENT}`);
+            }
+            options.headers = headers;
+        }
         return options;
     }
     /**