v2.1.2

いくつか修正できていない問題があるが、メモリリークに関しては改善が見られるのでリリースする。残る問題は今後に引き継ぐ。

Author: maskatsum

.github/workflows/ci.yml

@@ -4,16 +4,15 @@
 name: "tests"
 
 on:
-  pull_request:
-    branches:
-      - main
-      - develop
-    paths:
-      - 'src/**/*.ts'
-      - 'e2e/**/*.ts'
-      - '*.json'
-      - '*.js'
-      - '*.mjs'
+  # pull_request:
+  #   branches:
+  #     - main
+  #   paths:
+  #     - 'src/**/*.ts'
+  #     - 'e2e/**/*.ts'
+  #     - '*.json'
+  #     - '*.js'
+  #     - '*.mjs'
   push:
     branches:
       - main

.gitignore

@@ -19,3 +19,4 @@ log.txt
 ./.vscode/*.json
 .dockerignore
 Dockerfile
+./.vscode/rsdt_address.txt

.vscode/schools-output.csv

@@ -57909,7 +57909,7 @@ input,output,others,score,match_level,coordinate_level,lat,lon,lg_code,machiaza_
 "神奈川県横浜市金沢区瀬戸２２－２","神奈川県横浜市金沢区瀬戸22-2","-2",0.94,residential_block,residential_block,35.333985,139.617778,"141089","0004000",1,022,,,,神奈川県,,横浜市,金沢区,瀬戸,,,22,,,,,
 "神奈川県横須賀市平成町１丁目１０番１","神奈川県横須賀市平成町一丁目10-1","-1",0.89,residential_block,residential_block,35.273666,139.680704,"142018","0069001",1,010,,,,神奈川県,,横須賀市,,平成町,一丁目,,10,,,,,
 "神奈川県川崎市幸区小倉４－３０－１","神奈川県川崎市幸区小倉四丁目30-1","-1",0.78,residential_block,residential_block,35.53618,139.669894,"141321","0002004",1,030,,,,神奈川県,,川崎市,幸区,小倉,四丁目,,30,,,,,
-"神奈川県横浜市中区日本大通１１番地横浜情報文化センター５Ｆ","神奈川県横浜市中区日本大通11 横浜情報文化センタ 5F","横浜情報文化センタ 5F",0.9,parcel,machiaza,35.446371,139.642363,"141046","0096000",0,,,,000110000000000,神奈川県,,横浜市,中区,日本大通,,,,,,11,,
+"神奈川県横浜市中区日本大通１１番地横浜情報文化センター５Ｆ","神奈川県横浜市中区日本大通11 横浜情報文化センター 5F","横浜情報文化センター 5F",0.9,parcel,machiaza,35.446371,139.642363,"141046","0096000",0,,,,000110000000000,神奈川県,,横浜市,中区,日本大通,,,,,,11,,
 "神奈川県横浜市神奈川区六角橋３－２７－１","神奈川県横浜市神奈川区六角橋三丁目27-1","-1",0.81,residential_block,residential_block,35.484413,139.620771,"141020","0006003",1,027,,,,神奈川県,,横浜市,神奈川区,六角橋,三丁目,,27,,,,,
 "神奈川県横浜市金沢区六浦東１－５０－１","神奈川県横浜市金沢区六浦東一丁目50-1","-1",0.8,residential_block,residential_block,35.324278,139.625927,"141089","0002001",1,050,,,,神奈川県,,横浜市,金沢区,六浦東,一丁目,,50,,,,,
 "神奈川県横浜市鶴見区鶴見２－１－３","神奈川県横浜市鶴見区鶴見二丁目1-3","-3",0.78,residential_block,residential_block,35.505382,139.674436,"141011","0010002",1,001,,,,神奈川県,,横浜市,鶴見区,鶴見,二丁目,,1,,,,,

e2e/__tests__/common.ts

@@ -2,7 +2,7 @@ import { expect, jest } from '@jest/globals';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { Readable, Writable } from 'node:stream';
+import { Readable, Transform, Writable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 import {
   AbrGeocoder,
@@ -49,18 +49,100 @@ export type ExecOptions = {
 
 export const runGeocoder = async (options: ExecOptions) => {
 
-  if (process.env.USE_CLI) {
-    // コマンドラインからテストを実行する場合は、CLIから行う
-    return execaNode(options)(cliPath, [
-      "-",
-      "-silient",
-      `--target ${options.geocode.searchTarget}`,
-      `-f ${options.geocode.outputFormat}`,
-      `-d ${dbPath}`,
-    ]);
+  // 読み込みストリーム
+  const reader = (() => {
+    if (options.input) {
+      return Readable.from([options.input]);
+    } else if (options.inputFile) {
+      return fs.createReadStream(options.inputFile);
+    } else {
+      throw 'unknown input';
+    }
+  })();
+
+  // 1行ずつに分解するストリーム
+  const lineByLine = new LineStream();
+
+  // コメントを取り除くストリーム
+  const commentFilter = new CommentFilterTransform();
+
+  if (process.env.USE_HTTP) {
+    // ===========================================
+    // E2Eテスト時は、HTTPリクエストで処理を行う
+    // ===========================================
+    const format = ((): OutputFormat => {
+      switch (options.geocode.outputFormat) {
+        case OutputFormat.JSON: {
+          return OutputFormat.NDJSON;
+        }
+        case OutputFormat.GEOJSON: {
+          return OutputFormat.NDGEOJSON;
+        }
+        default: {
+          return options.geocode.outputFormat;
+        }
+      }
+    })();
+
+    const chunks: string[] = [];
+    const requester = new Writable({
+      objectMode: true,
+      async write(
+        address: string, 
+        _: BufferEncoding,
+        callback: (error?: Error | null | undefined) => void,
+      ) {
+
+        const query_params = new URLSearchParams({
+          // 検索対象の住所文字列
+          address,
+
+          // 検索対象
+          target: options.geocode.searchTarget,
+
+          // 出力書式
+          format,
+        });
+        const response = await fetch(`http://localhost:3000/geocode?${query_params}`, {
+          keepalive: true,
+        });
+
+        if (!response.ok) {
+          callback(new Error(`${response.status}: ${response.statusText}`));
+          return;
+        }
+        if (format === OutputFormat.CSV || format === OutputFormat.SIMPLIFIED) {
+          chunks.push(await response.text());
+          return;
+        }
+        chunks.push(JSON.stringify(await response.json()));
+        callback();
+      },
+    })
+
+    await pipeline(
+      reader,
+      lineByLine,
+      commentFilter,
+      requester,
+    )
+
+    if (format === OutputFormat.JSON || format === OutputFormat.GEOJSON) {
+      return {
+        stdout: `[${chunks.join(",")}]`,
+      }
+    }
+    return {
+      stdout: chunks.join("\n")
+    };
   }
-  // VSCode でデバッグする場合は、geocode-command.ts と同様の処理をすることで
+
+  // ===================================================
+  // VSCodeでデバッグする場合は、同じプロセス上で処理を行う。
+  //
+  // geocode-command.ts と同様の処理をすることで
   // ビルドしないでもデバッグできる
+  // ===================================================
   const abrgDir = options.useGlobalDB ? resolveHome(EnvProvider.DEFAULT_ABRG_DIR) : dbPath;
 
   const container = new AbrGeocoderDiContainer({
@@ -84,21 +166,12 @@ export const runGeocoder = async (options: ExecOptions) => {
     searchTarget: options.geocode.searchTarget,
   });
 
-  const reader = (() => {
-    if (options.input) {
-      return Readable.from([options.input]);
-    } else if (options.inputFile) {
-      return fs.createReadStream(options.inputFile);
-    } else {
-      throw 'unknown input';
-    }
-  })();
-
   const formatter = FormatterProvider.get({
     type: options.geocode.outputFormat,
     debug: false,
   });
 
+  // 書き込みストリーム
   const chunks: Buffer[] = [];
   const dst = new Writable({
     write(chunk, _, callback) {
@@ -107,9 +180,6 @@ export const runGeocoder = async (options: ExecOptions) => {
     },
   });
 
-  const lineByLine = new LineStream();
-  const commentFilter = new CommentFilterTransform();
-
   await pipeline(
     reader,
     lineByLine,