xshell 1.0.178 → 1.0.179

package/builder.d.ts

@@ -74,6 +74,7 @@ export interface BundlerOptions {
     exclude_modules?: RegExp;
     assets?: Assets;
     assets_root?: string;
+    template?: boolean;
     license?: {
         ignores?: string[];
     };
@@ -91,7 +92,8 @@ export declare class Bundler {
     config: Webpack.Configuration;
     htmls?: Record<string, HtmlOptions>;
     assets?: Assets;
-    assets_root?: string;
+    assets_root: string;
+    template: boolean;
     globals?: BundlerOptions['globals'];
     exclude_modules?: BundlerOptions['exclude_modules'];
     license?: {
@@ -114,9 +116,10 @@ export declare class Bundler {
             - assets?: 项目中需要直接复制到输出目录的资源，有 productions 但无 devs 时 (是同一套)，
                 在 dev 模式下会用 productions 中的资源，如果不需要 productions 资源， devs 可以设置为 [ ],
                 每一项是  string 或者 { src: '...', out: '...' }，路径相对于 fpd_root 和 fpd_out
-            - assets_root?: `''` 生成的 html 中是否使用 / 开头的绝对路径，以支持 browser router 路由能力
+            - assets_root?: `'/'` 生成的 html 中是否使用 / 开头的绝对路径，以支持 browser router 路由能力
                 启用后 assets, html 中的 icon, scripts 路径直接在前面添加 assets_root 来生成最终 html href
                 未启用时使用相对 html 路径来生成最终 html href
+            - template?: `false` 除了生成对应的 html 之外，还生成所有路径为 `{root}/...` 的模板 html 文件, 方便后续 server 替换渲染
             - local_loaders?: `true` true 时使用项目 node_modules/ 中的 loader;  false 时使用 D:/0/ 下面的
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
@@ -131,7 +134,7 @@ export declare class Bundler {
             - production?: `true` webpack mode 设置为 'production'
             - sass?: 传入 sass 实例避免 webpack 重复加载 .cjs 版本
             - license?: 使用 license-webpack-plugin 构建 ThirdPartyNotice.txt */
-    constructor(name: string, target: 'web' | 'nodejs', fpd_root: string, fpd_out: string, fpdt_cache: string, entry: Record<string, string>, { source_map, globals, external_dayjs, externals, htmls, assets, assets_root, commonjs2, single_chunk, dynamic_import, resolve_alias, resolve_fallback, assets_stats, analyzer, dts, exclude_modules, cache_version, production, sass, dependencies, license, }?: BundlerOptions);
+    constructor(name: string, target: 'web' | 'nodejs', fpd_root: string, fpd_out: string, fpdt_cache: string, entry: Record<string, string>, { source_map, globals, external_dayjs, externals, htmls, assets, assets_root, template, commonjs2, single_chunk, dynamic_import, resolve_alias, resolve_fallback, assets_stats, analyzer, dts, exclude_modules, cache_version, production, sass, dependencies, license, }?: BundlerOptions);
     build(print?: boolean): Promise<void>;
     close(): Promise<void>;
     build_all(print?: boolean): Promise<void>;

package/builder.js

@@ -117,6 +117,7 @@ export class Bundler {
     htmls;
     assets;
     assets_root;
+    template;
     globals;
     exclude_modules;
     license;
@@ -137,9 +138,10 @@ export class Bundler {
             - assets?: 项目中需要直接复制到输出目录的资源，有 productions 但无 devs 时 (是同一套)，
                 在 dev 模式下会用 productions 中的资源，如果不需要 productions 资源， devs 可以设置为 [ ],
                 每一项是  string 或者 { src: '...', out: '...' }，路径相对于 fpd_root 和 fpd_out
-            - assets_root?: `''` 生成的 html 中是否使用 / 开头的绝对路径，以支持 browser router 路由能力
+            - assets_root?: `'/'` 生成的 html 中是否使用 / 开头的绝对路径，以支持 browser router 路由能力
                 启用后 assets, html 中的 icon, scripts 路径直接在前面添加 assets_root 来生成最终 html href
                 未启用时使用相对 html 路径来生成最终 html href
+            - template?: `false` 除了生成对应的 html 之外，还生成所有路径为 `{root}/...` 的模板 html 文件, 方便后续 server 替换渲染
             - local_loaders?: `true` true 时使用项目 node_modules/ 中的 loader;  false 时使用 D:/0/ 下面的
             - commonjs2?: `false` 打包为 commonjs2 (.cjs) 的文件
             - single_chunk?: `true` 输出为单个文件，将依赖也打包到其中，不要生成多个 chunk
@@ -154,7 +156,7 @@ export class Bundler {
             - production?: `true` webpack mode 设置为 'production'
             - sass?: 传入 sass 实例避免 webpack 重复加载 .cjs 版本
             - license?: 使用 license-webpack-plugin 构建 ThirdPartyNotice.txt */
-    constructor(name, target, fpd_root, fpd_out, fpdt_cache, entry, { source_map = true, globals, external_dayjs = false, externals, htmls, assets, assets_root = '', commonjs2 = false, single_chunk = true, dynamic_import = true, resolve_alias, resolve_fallback, assets_stats = true, analyzer = false, dts = false, exclude_modules, cache_version, production = true, sass, dependencies, license, } = {}) {
+    constructor(name, target, fpd_root, fpd_out, fpdt_cache, entry, { source_map = true, globals, external_dayjs = false, externals, htmls, assets, assets_root = '/', template = false, commonjs2 = false, single_chunk = true, dynamic_import = true, resolve_alias, resolve_fallback, assets_stats = true, analyzer = false, dts = false, exclude_modules, cache_version, production = true, sass, dependencies, license, } = {}) {
         this.name = name;
         this.analyzer = analyzer;
         this.production = production;
@@ -165,6 +167,7 @@ export class Bundler {
         this.htmls = htmls;
         this.assets = assets;
         this.assets_root = assets_root;
+        this.template = template;
         this.globals = globals;
         this.exclude_modules = exclude_modules;
         if (dependencies) {
@@ -175,9 +178,7 @@ export class Bundler {
         // let smp = new SpeedMeasurePlugin()
         // const config: Webpack.Configuration = smp.wrap({
         let resolve_cache = {};
-        function get_loader(name) {
-            return resolve_cache[name] ??= fileURLToPath(import.meta.resolve(`${name}/package.json`)).fdir;
-        }
+        const get_loader = (name) => resolve_cache[name] ??= fileURLToPath(import.meta.resolve(`${name}/package.json`)).fdir;
         this.config = {
             name,
             mode: production ? 'production' : 'development',
@@ -493,25 +494,21 @@ export class Bundler {
     }
     async build_htmls(print = { info: true, files: false }) {
         await Promise.all(Object.entries(this.htmls).map(async ([fp_html, { fp_entry = 'index.js', device_viewport: device_width = false, icon, manifest, dependencies: _dependencies = this.dependencies, title, scripts, mscripts, notice = false, heads, }]) => {
-            const fpd_html = `${this.fpd_out}${fp_html}`.fdir;
-            const resolve = (asset) => this.assets_root ?
-                `${this.assets_root}${typeof asset === 'string' ? asset : asset.out}`
-                :
-                    path.relative(fpd_html, `${this.fpd_out}${typeof asset === 'string' ? asset : asset.out}`);
-            const html = '<!doctype html>\n' +
+            const get = (asset) => typeof asset === 'string' ? asset : asset.out;
+            const html_template = '<!doctype html>\n' +
                 '<html>\n' +
                 '    <head>\n' +
                 `        <title>${title}</title>\n` +
                 "        <meta charset='utf-8' />\n" +
                 (heads ? heads.map(head => `        ${head}`).join_lines() : '') +
                 (device_width ? "        <meta name='viewport' content='width=device-width, initial-scale=1.0' />\n" : '') +
-                (icon ? `        <link rel='icon' href='${resolve(icon)}' />\n` : '') +
-                (manifest ? `        <link rel='manifest' href='${resolve(manifest)}' />\n` : '') +
-                this.resolve_dependency_files(_dependencies, false, { production: this.production }).map(fp => `        <script src='${this.assets_root || '/'}vendors/${fp}' defer></script>`).join_lines() +
-                (scripts?.before ? scripts.before.map(asset => `        <script src='${resolve(asset)}' defer></script>`).join_lines() : '') +
-                (mscripts ? mscripts.map(mscript => `        <script src='${resolve(mscript)}' type='module'></script>`).join_lines() : '') +
-                `        <script src='${this.assets_root}${fp_entry}' type='module'></script>\n` +
-                (scripts?.after ? scripts.after.map(asset => `        <script src='${resolve(asset)}' defer></script>`).join_lines() : '') +
+                (icon ? `        <link rel='icon' href='{root}${icon}' />\n` : '') +
+                (manifest ? `        <link rel='manifest' href='{root}${manifest}' />\n` : '') +
+                this.resolve_dependency_files(_dependencies, false, { production: this.production }).map(fp => `        <script src='{root}vendors/${fp}' defer></script>`).join_lines() +
+                (scripts?.before ? scripts.before.map(asset => `        <script src='{root}${get(asset)}' defer></script>`).join_lines() : '') +
+                (mscripts ? mscripts.map(mscript => `        <script src='{root}${get(mscript)}' type='module'></script>`).join_lines() : '') +
+                `        <script src='{root}${fp_entry}' type='module'></script>\n` +
+                (scripts?.after ? scripts.after.map(asset => `        <script src='{root}${get(asset)}' defer></script>`).join_lines() : '') +
                 '    </head>\n' +
                 '    <body>\n' +
                 "        <div class='root'>\n" +
@@ -522,7 +519,10 @@ export class Bundler {
                 '        </div>\n' +
                 '    </body>\n' +
                 '</html>\n';
-            await fwrite(`${this.fpd_out}${fp_html}`, html, noprint);
+            await Promise.all([
+                fwrite(`${this.fpd_out}${fp_html}`, html_template.replaceAll('{root}', this.assets_root), noprint),
+                this.template && fwrite(`${this.fpd_out}${fp_html.strip_end('.html', true)}.template.html`, html_template, noprint)
+            ]);
             if (print.files)
                 console.log(`已构建 ${fp_html}`);
         }));

package/file.d.ts

@@ -176,12 +176,13 @@ export declare function fmkdir(fpd: string, { print, mode, }?: {
     /** `0o777` A file mode. If a string is passed, it is parsed as an octal integer. */
     mode?: string | number;
 }): Promise<string>;
-/** 创建软链接  Create soft links
-    - fp_real: 现在真实文件/文件夹的路径  current real file/directory path
-    - fp_link: 目标链接文件/文件夹的路径  target file/directory path */
-export declare function flink(fp_real: string, fp_link: string, { junction, print }?: {
+/** 创建软链接
+    - fp_real: 现在真实文件/文件夹的路径
+    - fp_link: 目标链接文件/文件夹的路径 */
+export declare function flink(fp_real: string, fp_link: string, { junction, print, skip_existing }?: {
     junction?: boolean;
     print?: boolean;
+    skip_existing?: boolean;
 }): Promise<void>;
 export interface ZipOptions {
     dirname?: string;

package/file.js

@@ -372,22 +372,27 @@ export async function fmkdir(fpd, { print = true, mode, } = {}) {
         console.log(t('已存在文件夹'), fpd);
     return fpd_;
 }
-/** 创建软链接  Create soft links
-    - fp_real: 现在真实文件/文件夹的路径  current real file/directory path
-    - fp_link: 目标链接文件/文件夹的路径  target file/directory path */
-export async function flink(fp_real, fp_link, { junction = false, print = true } = {}) {
-    assert(path.isAbsolute(fp_real) && path.isAbsolute(fp_link), t('fp 必须是绝对路径'));
+/** 创建软链接
+    - fp_real: 现在真实文件/文件夹的路径
+    - fp_link: 目标链接文件/文件夹的路径 */
+export async function flink(fp_real, fp_link, { junction = false, print = true, skip_existing = false } = {}) {
+    assert(path.isAbsolute(fp_real) && path.isAbsolute(fp_link), 'fp 必须是绝对路径');
     const is_fpd_real = fp_real.isdir;
     const is_fpd_link = fp_link.isdir;
-    assert(is_fpd_real === is_fpd_link, t('fp_real 和 fp_link 必须同为文件路径或文件夹路径'));
-    if (fexists(fp_link))
-        throw new Error(`${t('存在同名')}${is_fpd_link ? t('文件夹') : t('文件')}: ${fp_link}${t('，无法创建链接')}`);
+    assert(is_fpd_real === is_fpd_link, 'fp_real 和 fp_link 必须同为文件路径或文件夹路径');
+    if (fexists(fp_link, { print: false }))
+        if (!skip_existing)
+            throw new Error(`存在同名${is_fpd_link ? '文件夹' : '文件'}: ${fp_link}，无法创建链接`);
+        else {
+            console.log('跳过已存在: ', fp_link);
+            return;
+        }
     if (print)
-        console.log(`${t('已将源文件 ')}${fp_real}${t(' 链接到 ')}${fp_link}`);
+        console.log(`已将源文件 ${fp_real} 链接到 ${fp_link}`);
     if (junction)
-        fsp.symlink(fp_real, fp_link, 'junction');
+        await fsp.symlink(fp_real, fp_link, 'junction');
     else
-        fsp.symlink(fp_real, fp_link, is_fpd_real ? 'dir' : 'file');
+        await fsp.symlink(fp_real, fp_link, is_fpd_real ? 'dir' : 'file');
 }
 /** 将文件夹或文件列表压缩为 zip，返回生成的压缩包路径 (fp_zip)
     - data:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "1.0.178",
+    "version": "1.0.179",
     "type": "module",
     "main": "./index.js",
     "bin": {

package/path.d.ts

@@ -55,7 +55,7 @@ export declare function extname(path: string): string;
 /** `/` */
 export declare const sep = "/";
 /** The platform-specific file delimiter. ';' or ':'. */
-export declare const delimiter: ":" | ";";
+export declare const delimiter: ";" | ":";
 /** Returns an object from a path string - the opposite of format().
     @param path path to evaluate.
     @throws {TypeError} if `path` is not a string. */
@@ -83,7 +83,7 @@ export declare let path: {
     basename: typeof basename;
     extname: typeof extname;
     sep: string;
-    delimiter: ":" | ";";
+    delimiter: ";" | ":";
     parse: typeof parse;
     format: typeof format;
     toNamespacedPath: typeof toNamespacedPath;

package/server.d.ts

@@ -52,6 +52,7 @@ export declare class Server {
     stdio_subscribable?: boolean;
     stdio_subscribers: (((chunk: Uint8Array | string) => Promise<void>) & {
         id: number;
+        closer: (event: any) => void;
     })[];
     /** 原始 process.stdout.write 函数 bind 后的备份 */
     stdout_write: Function;

package/server.js

@@ -167,18 +167,27 @@ export class Server {
                         };
                         // 让后续可以通过 unsubscribe_stdio 取消订阅
                         subscriber.id = id;
-                        this.stdio_subscribers.push(subscriber);
-                        websocket.addEventListener('close', () => {
+                        const closer = subscriber.closer = () => {
                             const length = this.stdio_subscribers.length;
                             const stdio_subscribers_ = this.stdio_subscribers.filter(s => s !== subscriber);
                             if (stdio_subscribers_.length !== length) {
-                                console.log(t('由于 websocket 连接关闭，stdio 订阅被关闭'));
+                                console.log('由于 websocket 连接关闭，stdio 订阅被关闭');
                                 this.stdio_subscribers = stdio_subscribers_;
                             }
-                        }, { once: true });
+                        };
+                        this.stdio_subscribers.push(subscriber);
+                        websocket.addEventListener('close', closer, { once: true });
                     },
+                    /** 主动取消订阅，需要清理 stdio listener, websocket close lisener */
                     unsubscribe_stdio: ({ data: [id] }, websocket) => {
-                        this.stdio_subscribers = this.stdio_subscribers.filter(s => s.id !== id);
+                        this.stdio_subscribers = this.stdio_subscribers.filter(s => {
+                            if (s.id === id) {
+                                websocket.removeEventListener('close', s.closer);
+                                return false;
+                            }
+                            else
+                                return true;
+                        });
                         console.log(t('已取消订阅 stdio'));
                         return [];
                     },

package/utils.browser.d.ts

@@ -75,7 +75,7 @@ export declare function encode(str: string): Uint8Array;
     在流式处理 (buffer 可能不完整) 时，应使用独立的 TextDecoder 实例调用 decode(buffer, { stream: true }) */
 export declare function decode(buffer: Uint8Array): string;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): 1 | 0 | -1;
 /** 比较 1.10.02 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */

package/utils.d.ts

@@ -42,7 +42,7 @@ export declare function filter_values<TObj extends Record<string, any>>(obj: TOb
 /** 忽略对象中的 keys, 返回新对象 */
 export declare function omit<TObj>(obj: TObj, omit_keys: string[]): TObj;
 /** 字符串字典序比较 */
-export declare function strcmp(l: string, r: string): 0 | 1 | -1;
+export declare function strcmp(l: string, r: string): 1 | 0 | -1;
 /** 比较 1.10.02 这种版本号
     - l, r: 两个版本号字符串
     - loose?: 宽松模式，允许两个版本号格式（位数）不一致 */