Merge pull request #90 from Kanahiro/rmstream

rm hono/stream, publish as library

.github/workflows/npm.yml

@@ -0,0 +1,18 @@
+name: Publish Package to npmjs
+on:
+    release:
+        types: [published]
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            # Setup .npmrc file to publish to npm
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: '20.x'
+                  registry-url: 'https://registry.npmjs.org'
+            - run: npm ci
+            - run: npm publish --provenance --access public
+              env:
+                  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -1,9 +1,13 @@
 {
   "type": "module",
   "name": "chiitiler",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Tiny map rendering server for MapLibre Style Spec",
-  "main": "dist/main.js",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "tsc",
     "dev": "tsx watch src/main.ts tile-server -D",

src/cli.test.ts

@@ -12,7 +12,12 @@ describe('run chiitiler', () => {
         vi.spyOn(server, 'initServer').mockImplementation(
             (opts: server.InitServerOptions) => {
                 options = opts;
-                return { app: {} as any, start: vi.fn() };
+                return {
+                    app: {} as any,
+                    tiles: {} as any,
+                    bbox: {} as any,
+                    start: vi.fn(),
+                };
             },
         );
 
@@ -29,7 +34,12 @@ describe('run chiitiler', () => {
         vi.spyOn(server, 'initServer').mockImplementation(
             (opts: server.InitServerOptions) => {
                 options = opts;
-                return { app: {} as any, start: vi.fn() };
+                return {
+                    app: {} as any,
+                    tiles: {} as any,
+                    bbox: {} as any,
+                    start: vi.fn(),
+                };
             },
         );
 
@@ -46,7 +56,12 @@ describe('run chiitiler', () => {
         vi.spyOn(server, 'initServer').mockImplementation(
             (opts: server.InitServerOptions) => {
                 options = opts;
-                return { app: {} as any, start: vi.fn() };
+                return {
+                    app: {} as any,
+                    tiles: {} as any,
+                    bbox: {} as any,
+                    start: vi.fn(),
+                };
             },
         );
 

src/index.ts

@@ -0,0 +1 @@
+export { initServer, type InitServerOptions } from './server/index.js';

src/render/index.ts

@@ -173,7 +173,7 @@ async function getRenderedBboxBuffer({
     cache: Cache;
     ext: SupportedFormat;
     quality: number;
-}): Promise<Sharp> {
+}): Promise<Buffer> {
     const style = await loadStyle(stylejson, cache);
 
     const { zoom, width, height, center } = calcRenderingParams(bbox, size);
@@ -199,17 +199,13 @@ async function getRenderedBboxBuffer({
     });
     switch (ext) {
         case 'png':
-            _sharp = await _sharp.png();
-            break;
+            return await _sharp.png().toBuffer();
         case 'jpeg':
         case 'jpg':
-            _sharp = await _sharp.jpeg({ quality });
-            break;
+            return await _sharp.jpeg({ quality }).toBuffer();
         case 'webp':
-            _sharp = await _sharp.webp({ quality, effort: 0 });
-            break;
+            return await _sharp.webp({ quality, effort: 0 }).toBuffer();
     }
-    return _sharp;
 }
 
 export { getRenderedTileBuffer, getRenderedBboxBuffer, type SupportedFormat };

src/server/index.ts

@@ -1,5 +1,4 @@
 import { Hono } from 'hono';
-import { stream } from 'hono/streaming';
 import { serve } from '@hono/node-server';
 import {
     type StyleSpecification,
@@ -133,7 +132,7 @@ function initServer(options: InitServerOptions) {
             const size = Number(c.req.query('size') ?? 1024);
 
             try {
-                const sharp = await getRenderedBboxBuffer({
+                const buf = await getRenderedBboxBuffer({
                     stylejson: url,
                     bbox: [minx, miny, maxx, maxy],
                     size,
@@ -142,12 +141,7 @@ function initServer(options: InitServerOptions) {
                     quality,
                 });
                 c.header('Content-Type', `image/${ext}`);
-                return stream(c, async (stream) => {
-                    for await (const chunk of sharp) {
-                        stream.write(chunk);
-                    }
-                    stream.close();
-                });
+                return c.body(buf);
             } catch (e) {
                 console.error(`render error: ${e}`);
                 return c.body('failed to render bbox', 400);
@@ -171,7 +165,7 @@ function initServer(options: InitServerOptions) {
             const size = Number(c.req.query('size') ?? 1024);
 
             try {
-                const sharp = await getRenderedBboxBuffer({
+                const buf = await getRenderedBboxBuffer({
                     stylejson: style,
                     bbox: [minx, miny, maxx, maxy],
                     size,
@@ -180,12 +174,7 @@ function initServer(options: InitServerOptions) {
                     quality,
                 });
                 c.header('Content-Type', `image/${ext}`);
-                return stream(c, async (stream) => {
-                    for await (const chunk of sharp) {
-                        stream.write(chunk);
-                    }
-                    stream.close();
-                });
+                return c.body(buf);
             } catch (e) {
                 console.error(`render error: ${e}`);
                 return c.body('failed to render bbox', 400);
@@ -203,6 +192,8 @@ function initServer(options: InitServerOptions) {
 
     return {
         app: hono,
+        tiles,
+        bbox,
         start: () => serve({ port: options.port, fetch: hono.fetch }),
     };
 }

tsconfig.json

@@ -4,8 +4,9 @@
         "moduleResolution": "NodeNext",
         "outDir": "./dist",
         "resolveJsonModule": true,
-        "esModuleInterop": true
+        "esModuleInterop": true,
+        "declaration": true
     },
     "include": ["src/**/*"],
-    "exclude": ["node_modules", "build", "dist"]
+    "exclude": ["node_modules", "build", "dist", "**/*.test.ts"]
 }