@logto/tunnel 0.2.0 → 0.2.2

package/lib/commands/tunnel/utils.d.ts

@@ -25,4 +25,4 @@ export declare const checkExperienceInput: (url?: string, staticPath?: string) =
  * @example isLogtoRequestPath('/consent') // true
  */
 export declare const isLogtoRequestPath: (requestPath?: string) => boolean;
-export declare const isFileAssetPath: (url: string) => boolean;
+export declare const getMimeType: (requestPath: string) => string;

package/lib/commands/tunnel/utils.js

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { isValidUrl } from '@logto/core-kit';
+import { isFileAssetPath, isValidUrl, parseRange } from '@logto/core-kit';
 import { conditional, trySafe } from '@silverhand/essentials';
 import chalk from 'chalk';
 import { createProxyMiddleware, responseInterceptor } from 'http-proxy-middleware';
@@ -35,18 +35,42 @@ export const createStaticFileProxy = (staticPath) => async (request, response) =
     if (request.method === 'HEAD' || request.method === 'GET') {
         const fallBackToIndex = !isFileAssetPath(request.url);
         const requestPath = path.join(staticPath, fallBackToIndex ? index : request.url);
+        const { range = '' } = request.headers;
+        const readFile = async (requestPath, start, end) => {
+            const fileHandle = await fs.open(requestPath, 'r');
+            const { size } = await fileHandle.stat();
+            const readStart = start ?? 0;
+            const readEnd = end ?? Math.max(size - 1, 0);
+            const buffer = Buffer.alloc(readEnd - readStart + 1);
+            await fileHandle.read(buffer, 0, buffer.length, readStart);
+            await fileHandle.close();
+            return { buffer, totalFileSize: size };
+        };
+        const setRangeHeaders = (response, range, totalFileSize) => {
+            if (range) {
+                const { start, end } = parseRange(range);
+                const readStart = start ?? 0;
+                const readEnd = end ?? totalFileSize - 1;
+                response.setHeader('Accept-Ranges', 'bytes');
+                response.setHeader('Content-Range', `bytes ${readStart}-${readEnd}/${totalFileSize}`);
+            }
+        };
         try {
-            const content = await fs.readFile(requestPath, 'utf8');
+            const { start, end } = parseRange(range);
+            const { buffer, totalFileSize } = await readFile(requestPath, start, end);
             response.setHeader('cache-control', fallBackToIndex ? noCache : maxAgeSevenDays);
             response.setHeader('content-type', getMimeType(request.url));
-            response.writeHead(200);
-            response.end(content);
+            setRangeHeaders(response, range, totalFileSize);
+            response.setHeader('content-length', String(buffer.length));
+            response.writeHead(range ? 206 : 200);
+            response.end(buffer);
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             consoleLog.error(chalk.red(errorMessage));
             response.setHeader('content-type', getMimeType(request.url));
-            response.writeHead(existsSync(request.url) ? 500 : 404);
+            const statusCode = errorMessage === 'Range not satisfiable.' ? 416 : existsSync(request.url) ? 500 : 404;
+            response.writeHead(statusCode);
             response.end();
         }
     }
@@ -116,12 +140,7 @@ Specify --help for available options`);
  * @example isLogtoRequestPath('/consent') // true
  */
 export const isLogtoRequestPath = (requestPath) => ['/oidc/', '/api/'].some((path) => requestPath?.startsWith(path)) || requestPath === '/consent';
-export const isFileAssetPath = (url) => {
-    // Check if the request URL contains query params. If yes, ignore the params and check the request path
-    const pathWithoutQuery = url.split('?')[0];
-    return Boolean(pathWithoutQuery?.split('/').at(-1)?.includes('.'));
-};
-const getMimeType = (requestPath) => {
+export const getMimeType = (requestPath) => {
     const fallBackToIndex = !isFileAssetPath(requestPath);
     if (fallBackToIndex) {
         return indexContentType;

package/lib/commands/tunnel/utils.test.js

@@ -1,14 +1,11 @@
 import { expect, describe, it } from 'vitest';
-import { isFileAssetPath } from './utils.js';
+import { getMimeType } from './utils.js';
 describe('Tunnel utils', () => {
-    it('should be able to check if a request path is file asset', () => {
-        expect(isFileAssetPath('/file.js')).toBe(true);
-        expect(isFileAssetPath('/file.css')).toBe(true);
-        expect(isFileAssetPath('/file.png')).toBe(true);
-        expect(isFileAssetPath('/oidc/.well-known/openid-configuration')).toBe(false);
-        expect(isFileAssetPath('/oidc/auth')).toBe(false);
-        expect(isFileAssetPath('/api/interaction/submit')).toBe(false);
-        expect(isFileAssetPath('/consent')).toBe(false);
-        expect(isFileAssetPath('/callback/45doq0d004awrjyvdbp92?state=PxsR_Iqtkxw&code=4/0AcvDMrCOMTFXWlKzTcUO24xDify5tQbIMYvaYDS0sj82NzzYlrG4BWXJB4-OxjBI1RPL8g&scope=email%20profile%20openid%20https:/www.googleapis.com/auth/userinfo.profile%20https:/www.googleapis.com/auth/userinfo.email&authuser=0&hd=silverhand.io&prompt=consent')).toBe(false);
+    it('should be able to get mime type according to request path', () => {
+        expect(getMimeType('/scripts.js')).toEqual('text/javascript');
+        expect(getMimeType('/image.png')).toEqual('image/png');
+        expect(getMimeType('/style.css')).toEqual('text/css');
+        expect(getMimeType('/index.html')).toEqual('text/html');
+        expect(getMimeType('/')).toEqual('text/html; charset=utf-8');
     });
 });

package/lib/package-json.js

@@ -1,6 +1,6 @@
 export const packageJson = {
     "name": "@logto/tunnel",
-    "version": "0.2.0",
+    "version": "0.2.2",
     "description": "A CLI tool that creates tunnel service to Logto Cloud for local development.",
     "author": "Silverhand Inc. <contact@silverhand.io>",
     "homepage": "https://github.com/logto-io/logto#readme",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/tunnel",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A CLI tool that creates tunnel service to Logto Cloud for local development.",
   "author": "Silverhand Inc. <contact@silverhand.io>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -38,8 +38,8 @@
     "ora": "^8.0.1",
     "yargs": "^17.6.0",
     "zod": "^3.23.8",
-    "@logto/core-kit": "^2.5.0",
-    "@logto/shared": "^3.1.1"
+    "@logto/shared": "^3.1.2",
+    "@logto/core-kit": "^2.5.1"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "6.0.1",