xshell 1.1.25 → 1.2.0

package/builder.d.ts

@@ -89,7 +89,7 @@ export declare class Bundler {
     target: 'nodejs' | 'web';
     production: boolean;
     fpd_out: string;
-    source_map: boolean;
+    source_map: BundlerOptions['source_map'];
     dependencies: DependencyId[];
     analyzer: boolean;
     config: Webpack.Configuration;
@@ -154,7 +154,7 @@ export declare class Bundler {
         - assets: false 时只包括在 script 标签加载的文件;  true 时包括 assets, maps 等 */
     resolve_dependency_assets(_dependencies: DependencyId[], assets: boolean, { production, source_map }?: {
         production?: boolean;
-        source_map?: boolean;
+        source_map?: BundlerOptions['source_map'];
     }): (string | AssetOption)[];
     copy_files({ dependencies, production, assets, fpd_root, fpd_out, print }?: {
         dependencies?: DependencyId[];

package/builder.js

@@ -378,7 +378,7 @@ export class Bundler {
                 } : {}
             },
             ignoreWarnings: [
-                ...this.source_map ? [/Failed to parse source map/] : [],
+                ...source_map ? [/Failed to parse source map/] : [],
                 ...this.license ? [
                     /** LicenseWebpackPlugin 会添加过时的 string 类型的 warning，无法被正则表达式的逻辑匹配，这里只能手动用函数过滤 */
                     (warning) => typeof warning === 'string' && warning.startsWith('license-webpack-plugin: could not find any license ')

package/file.d.ts

@@ -11,8 +11,7 @@ export declare const ramdisk: boolean;
 export declare function fexists(fp: string, { print }?: {
     print?: boolean;
 }): boolean;
-/** 打开文件，返回 FileHandle
-    open file, return FileHandle
+/** 打开或创建文件，返回 FileHandle, 如果文件夹不存在，会自动创建文件夹
     Some characters (`< > : " / \ | ? *`) are reserved under Windows as documented
     by [Naming Files, Paths, and Namespaces](https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file). Under NTFS, if the filename contains
     a colon, Node.js will open a file system stream, as described by [this MSDN page](https://docs.microsoft.com/en-us/windows/desktop/FileIO/using-streams).

package/file.js

@@ -3,7 +3,7 @@ import { isUint8Array } from 'util/types';
 import { path } from "./path.js";
 import { t } from "./i18n/instance.js";
 import { to_json } from "./prototype.js";
-import { check, Lock, WritableMemoryStream } from "./utils.js";
+import { check, Lock, WritableMemoryStream, url_width } from "./utils.js";
 export { fsp };
 export const encodings = ['utf-8', 'gb18030', 'shift-jis', 'utf-16le'];
 export const ramdisk = fexists('T:/TEMP/', { print: false });
@@ -15,8 +15,7 @@ export function fexists(fp, { print = true } = {}) {
         console.log(exists ? t('已存在') : t('不存在'), fp);
     return exists;
 }
-/** 打开文件，返回 FileHandle
-    open file, return FileHandle
+/** 打开或创建文件，返回 FileHandle, 如果文件夹不存在，会自动创建文件夹
     Some characters (`< > : " / \ | ? *`) are reserved under Windows as documented
     by [Naming Files, Paths, and Namespaces](https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file). Under NTFS, if the filename contains
     a colon, Node.js will open a file system stream, as described by [this MSDN page](https://docs.microsoft.com/en-us/windows/desktop/FileIO/using-streams).
@@ -27,13 +26,10 @@ export function fexists(fp, { print = true } = {}) {
 export async function fopen(fp, flags = 'r', { mode, print } = {}) {
     if (print)
         console.log(t('打开文件'), fp);
+    await fmkdir(fp.fdir, { print: false });
     return Object.assign(await fsp.open(fp, flags, mode), { fp, flags, mode });
 }
-export async function fread(fp, { dir, encoding = 'utf-8', print = true } = {}) {
-    if (dir) {
-        check(dir.isdir, t('dir 必须以 / 结尾'));
-        fp = dir + fp;
-    }
+export async function fread(fp, { encoding = 'utf-8', print = true } = {}) {
     check(!fp.isdir, t('fp 必须是文件，不能以 / 结尾'));
     check(path.isAbsolute(fp), `${t('fp 必须是绝对路径:')} ${fp}`);
     check(encoding !== 'auto');
@@ -284,7 +280,7 @@ export async function fcopy(fp_src, fp_dst, { print = true, overwrite = true, fi
     if (!isdir && filter)
         throw new Error(t('filter 选项只适用于 fp_src 为文件夹'));
     if (print)
-        console.log(t('复制'), fp_src, '->', fp_dst);
+        log_action('复制', fp_src, fp_dst);
     if (isdir)
         if (filter) {
             await fmkdir(fp_dst, { print });
@@ -331,7 +327,7 @@ export async function fmove(fp_src, fp_dst, { overwrite = false, print = true }
     check(fp_src.isdir === fp_dst.isdir, t('fp_src 和 fp_dst 必须同为文件路径或文件夹路径'));
     check(path.isAbsolute(fp_src) && path.isAbsolute(fp_dst), t('fp_src 和 fp_dst 必须为完整路径'));
     if (print)
-        console.log(t('移动'), fp_src, '->', fp_dst);
+        log_action('移动', fp_src, fp_dst);
     if (!overwrite && fexists(fp_dst, { print: false }))
         throw new Error(`${t('已存在')} ${fp_dst}`);
     await fmkdir(fp_dst.fdir, { print: false });
@@ -367,7 +363,7 @@ export async function frename(fp, fp_, { fpd, print = true, overwrite = true } =
     }
     check(path.isAbsolute(fp) && path.isAbsolute(fp_), t('fp 和 fp_ 必须是绝对路径'));
     if (print)
-        console.log(t('重命名'), fp, '->', fp_);
+        log_action('重命名', fp, fp_);
     if (!overwrite && fexists(fp_, { print: false }))
         throw new Error(`${t('已存在')} ${fp}`);
     await fsp.rename(fp, fp_);
@@ -420,7 +416,7 @@ export async function flink(fp_real, fp_link, { junction = false, print = true,
             return;
         }
     if (print)
-        console.log(`已将源文件 ${fp_real} 链接到 ${fp_link}`);
+        log_action('已将源文件', fp_real, fp_link, '链接到');
     if (junction)
         await fsp.symlink(fp_real, fp_link, 'junction');
     else
@@ -469,7 +465,7 @@ async function _zip(data, fp_zip, { dirname, print = { files: true, info: true }
         entries = data;
     }
     if (print.info)
-        console.log(`开始压缩${fpd_src ? ` ${fpd_src}` : '文件索引'} -> ${fp_zip ? `${fp_zip}/${dirname || '{entries}'}` : '内存'}`);
+        log_action('开始压缩', fpd_src ? ` ${fpd_src}` : '文件索引', fp_zip ? `${fp_zip}/${dirname || '{entries}'}` : '内存');
     const { default: archiver } = await import('archiver');
     let archive = archiver('zip');
     let ostream = fp_zip ?
@@ -490,14 +486,14 @@ async function _zip(data, fp_zip, { dirname, print = { files: true, info: true }
             const fdata = entries[fp];
             if (fdata instanceof Uint8Array) {
                 if (print.files)
-                    console.log(`压缩 ${fdata.length.to_fsize_str()} -> ${fp}`);
+                    log_action('压缩', fdata.length.to_fsize_str(), fp);
                 archive.append(Buffer.isBuffer(fdata) ? fdata : Buffer.from(fdata.buffer), { name: fp });
             }
             else {
                 check(fp.isdir === fdata.isdir);
                 check(path.isAbsolute(fdata));
                 if (print.files)
-                    console.log(`压缩 ${fdata} -> ${fp}`);
+                    log_action('压缩', fdata, fp);
                 if (fp.isdir)
                     archive.directory(fdata, fp);
                 else
@@ -517,7 +513,7 @@ export async function ftail(fp, handler, { print = true } = {}) {
     const { size } = await fstat(fp);
     let pointer = Number(size);
     let lock = new Lock(await fopen(fp));
-    let fbuf = new Uint8Array(2 ** 20);
+    let fbuf = Buffer.allocUnsafe(2 ** 20);
     let strbuf = '';
     let decoder = new TextDecoder();
     if (print)
@@ -563,4 +559,7 @@ export async function freplace(fp, pattern, replacement, { print = true } = {})
     await fwrite(fp, (await fread(fp, { print }))
         .replaceAll(pattern, replacement), { print });
 }
+function log_action(action, fp_src, fp_dst, sep = '->') {
+    console.log(`${`${action} ${fp_src}`.pad(url_width)} ${sep} ${fp_dst}`);
+}
 //# sourceMappingURL=file.js.map

package/io.browser.d.ts

@@ -0,0 +1,22 @@
+import './prototype.browser.ts';
+/** 二进制消息格式, 按 key 的顺序序列化值 */
+export interface Message<TData = any> {
+    /** rpc id: 在 rpc 系统中认为是唯一的。用来在单个 websocket 连接上同时进行多个 rpc 请求。
+        多个相同 id 的 message 组成一个请求流 */
+    id?: number;
+    /** 只在 rpc 发起时指定被调用的 function name，发起时 rpc 时必传 */
+    func?: string;
+    /** 传输的数据
+        - rpc 发起方调用 func 的参数（此时为数组），或者请求流 message 携带的数据
+        - 调用结果（通常为单个返回值）或者响应流的数据，传给请求发起方 */
+    data?: TData;
+    /** 通知对方这里产生的错误，本质上类似 data 也是一种数据，并不代表 rpc 的结束，后续可能继续有 rpc message 交换 */
+    error?: Error;
+    /** 通过这个 flag 主动表明这是发往对方的最后一个 message, 对方可以销毁 handler 了
+        并非强制，可以设置，由双方的函数自己约定 */
+    done?: boolean;
+}
+/** 用这个符号来标识 message 对象 */
+export declare const message_symbol: unique symbol;
+export declare function parse<TReturn>(_buf: Uint8Array): TReturn;
+export declare function pack(obj: any): Uint8Array<ArrayBuffer>;