narou 0.5.0 → 0.6.2

package/src/ranking.ts

@@ -1,107 +1,111 @@
-import api from "./narou";
-import { NarouRankingResult, RankingResult } from "./narou-ranking-results";
-import { Fields } from "./index";
-import SearchBuilder from "./search-builder";
-import { addDays, format } from "date-fns";
-import { RankingParams } from "./params";
-
-export enum RankingType {
-  Daily = "d",
-  Weekly = "w",
-  Monthly = "m",
-  Quarterly = "q"
-}
-
-const dateFormat = "yyyyMMdd";
-
-/**
- * ランキングヘルパー
- * @class Ranking
- */
-export default class RankingBuilder {
-  protected date$: Date;
-  protected type$: RankingType;
-
-  /**
-   * constructor
-   * @private
-   */
-  constructor(protected params: Partial<RankingParams> = {}) {
-    /**
-     * クエリパラメータ
-     * @protected
-     */
-    this.date$ = addDays(Date.now(), -1);
-    this.type$ = RankingType.Daily;
-  }
-
-  date(date: Date) {
-    this.date$ = date;
-    return this;
-  }
-
-  type(type: RankingType) {
-    this.type$ = type;
-    return this;
-  }
-
-  /**
-   * gzip圧縮する。
-   *
-   * 転送量上限を減らすためにも推奨
-   * @param {number} level gzip圧縮レベル(1～5)
-   * @return {SearchBuilder} this
-   */
-  gzip(level: number) {
-    this.set({ gzip: level });
-    return this;
-  }
-
-  /**
-   * クエリパラメータをセットする
-   * @private
-   * @return {SearchBuilder} this
-   */
-  protected set(obj: any) {
-    Object.assign(this.params, obj);
-    return this;
-  }
-
-  /**
-   * なろう小説APIへのリクエストを実行する
-   * @returns ランキング
-   */
-  execute(): Promise<NarouRankingResult[]> {
-    const date = format(this.date$, dateFormat);
-    this.set({ rtype: `${date}-${this.type$}` });
-    return api.executeRanking(this.params as RankingParams);
-  }
-
-  async executeWithFields(
-    fields: Fields | Fields[] = [],
-    opt?: "weekly"
-  ): Promise<RankingResult[]> {
-    const ranking = await this.execute();
-    const fields$: Fields[] = Array.isArray(fields)
-      ? fields.length == 0
-        ? []
-        : [...fields, Fields.ncode]
-      : [fields, Fields.ncode];
-
-    const rankingNcodes = ranking.map(({ ncode }) => ncode);
-    const builder = new SearchBuilder();
-    builder.fields(fields$);
-    if (opt) {
-      builder.opt(opt);
-    }
-    builder.ncode(rankingNcodes);
-    builder.limit(ranking.length);
-    const result = await builder.execute();
-
-    // TODO: 型的にはNull許容ではないが許容しているのでなんとかする（削除されている小説がある）
-    return ranking.map<RankingResult>(r => ({
-      ...r,
-      ...(result.values.find(novel => novel.ncode == r.ncode) ?? ({} as any))
-    }));
-  }
-}
+import { NarouRankingResult, RankingResult } from "./narou-ranking-results";
+import { Fields } from "./index";
+import SearchBuilder from "./search-builder";
+import { addDays, format } from "date-fns";
+import { RankingParams } from "./params";
+import NarouNovel from "./narou";
+import NarouNovelFetch from "./narou-fetch";
+
+export enum RankingType {
+  Daily = "d",
+  Weekly = "w",
+  Monthly = "m",
+  Quarterly = "q",
+}
+
+const dateFormat = "yyyyMMdd";
+
+/**
+ * ランキングヘルパー
+ * @class Ranking
+ */
+export default class RankingBuilder {
+  protected date$: Date;
+  protected type$: RankingType;
+
+  /**
+   * constructor
+   * @private
+   */
+  constructor(
+    protected params: Partial<RankingParams> = {},
+    protected api: NarouNovel
+  ) {
+    /**
+     * クエリパラメータ
+     * @protected
+     */
+    this.date$ = addDays(Date.now(), -1);
+    this.type$ = RankingType.Daily;
+  }
+
+  date(date: Date) {
+    this.date$ = date;
+    return this;
+  }
+
+  type(type: RankingType) {
+    this.type$ = type;
+    return this;
+  }
+
+  /**
+   * gzip圧縮する。
+   *
+   * 転送量上限を減らすためにも推奨
+   * @param {number} level gzip圧縮レベル(1～5)
+   * @return {RankingBuilder} this
+   */
+  gzip(level: number) {
+    this.set({ gzip: level });
+    return this;
+  }
+
+  /**
+   * クエリパラメータをセットする
+   * @private
+   * @return {RankingBuilder} this
+   */
+  protected set(obj: any) {
+    Object.assign(this.params, obj);
+    return this;
+  }
+
+  /**
+   * なろう小説APIへのリクエストを実行する
+   * @returns ランキング
+   */
+  execute(): Promise<NarouRankingResult[]> {
+    const date = format(this.date$, dateFormat);
+    this.set({ rtype: `${date}-${this.type$}` });
+    return this.api.executeRanking(this.params as RankingParams);
+  }
+
+  async executeWithFields(
+    fields: Fields | Fields[] = [],
+    opt?: "weekly"
+  ): Promise<RankingResult[]> {
+    const ranking = await this.execute();
+    const fields$: Fields[] = Array.isArray(fields)
+      ? fields.length == 0
+        ? []
+        : [...fields, Fields.ncode]
+      : [fields, Fields.ncode];
+
+    const rankingNcodes = ranking.map(({ ncode }) => ncode);
+    const builder = new SearchBuilder({}, this.api);
+    builder.fields(fields$);
+    if (opt) {
+      builder.opt(opt);
+    }
+    builder.ncode(rankingNcodes);
+    builder.limit(ranking.length);
+    const result = await builder.execute();
+
+    // TODO: 型的にはNull許容ではないが許容しているのでなんとかする（削除されている小説がある）
+    return ranking.map<RankingResult>((r) => ({
+      ...r,
+      ...(result.values.find((novel) => novel.ncode == r.ncode) ?? ({} as any)),
+    }));
+  }
+}

package/src/search-builder-r18.ts

@@ -1,4 +1,3 @@
-import api from "./narou";
 import SearchBuilder from "./search-builder";
 import INarouSearchResults from "./narou-search-results";
 import { R18Site } from "./params";
@@ -14,7 +13,7 @@ export default class SearchBuilderR18 extends SearchBuilder {
    * @returns {Promise<INarouSearchResults>} 検索結果
    */
   execute(): Promise<INarouSearchResults> {
-    return api.executeNovel18(this.params);
+    return this.api.executeNovel18(this.params);
   }
 
   r18Site(sites: R18Site | R18Site[]) {

package/src/search-builder.ts

@@ -1,4 +1,6 @@
+import { NarouNovel } from ".";
 import api from "./narou";
+import NarouNovelFetch from "./narou-fetch";
 import INarouSearchResults from "./narou-search-results";
 import { BigGenre, Genre } from "./params";
 import {
@@ -7,7 +9,7 @@ import {
   Order,
   Buntai,
   NovelType,
-  GzipLevel
+  GzipLevel,
 } from "./params";
 
 /**
@@ -19,7 +21,7 @@ export default class SearchBuilder {
    * constructor
    * @private
    */
-  constructor(protected params: SearchParams = {}) {}
+  constructor(protected params: SearchParams = {}, protected api: NarouNovel) {}
 
   /**
    * a
@@ -423,7 +425,7 @@ export default class SearchBuilder {
    * @returns {Promise<NarouSearchResults>} 検索結果
    */
   execute(): Promise<INarouSearchResults> {
-    return api.executeNovel(this.params);
+    return this.api.executeNovel(this.params);
   }
 }
 

package/src/util/jsonp.ts

@@ -0,0 +1,66 @@
+/**
+ * MIT license
+ */
+import nodeURL from "./url";
+
+// Callback index.
+let count = 0;
+
+type CallbackId<Prefix extends string = string> = `${Prefix}${number}`;
+
+declare global {
+  interface Window {
+    [key: CallbackId]: (data: any) => void;
+  }
+}
+export type JsonpOption = {
+  prefix?: string;
+  param?: string;
+  timeout?: number;
+};
+const noop = function () {};
+
+export function jsonp<T>(
+  url: string,
+  { prefix = "__jp", param = "callback", timeout = 15000 }: JsonpOption = {}
+): Promise<T> {
+  return new Promise(function (resolve, reject) {
+    const targetChild = document.getElementsByTagName("script").item(0);
+    const target = targetChild?.parentNode ?? document.head;
+
+    const id: CallbackId = `${prefix}${count++}`;
+    const cleanup = function () {
+      // Remove the script tag.
+      if (script && script.parentNode) {
+        script.parentNode.removeChild(script);
+      }
+
+      window[id] = noop;
+
+      if (timer) {
+        clearTimeout(timer);
+      }
+    };
+
+    const timer =
+      timeout > 0
+        ? setTimeout(() => {
+            cleanup();
+            reject(new Error("Timeout"));
+          }, timeout)
+        : undefined;
+
+    const callback = (data: T) => {
+      cleanup();
+      resolve(data);
+    };
+    window[id] = callback;
+
+    // Create script.
+    const script = document.createElement("script");
+    const urlObj = new nodeURL(url);
+    urlObj.searchParams.set(param, id);
+    script.setAttribute("src", urlObj.toString());
+    target.insertBefore(script, targetChild);
+  });
+}

package/src/util/unzipp.ts

@@ -1,9 +1,9 @@
-import { gunzip, InputType } from "zlib";
-import { promisify } from "util";
-
-const gunzipAsync = promisify<InputType, Buffer>(gunzip);
-
-export async function unzipp(data: InputType) {
-  const buffer = await gunzipAsync(data);
-  return JSON.parse(buffer.toString());
-}
+import { gunzip, InputType } from "zlib";
+import { promisify } from "util";
+
+const gunzipAsync = promisify<InputType, Buffer>(gunzip);
+
+export async function unzipp(data: InputType) {
+  const buffer = await gunzipAsync(data);
+  return JSON.parse(buffer.toString());
+}

package/src/util/url.ts

@@ -0,0 +1,7 @@
+import { URL as nodeURL } from "url";
+let windowURL = null;
+if (typeof window !== "undefined") {
+  windowURL = window.URL;
+}
+
+export default windowURL ?? nodeURL;