pubo-node 1.0.206 → 1.0.207

package/lib/child-process/index.d.ts

@@ -1,11 +1,15 @@
-export declare function getProcessName(pid: any): Promise<string>;
-export declare function getPidByPort(port: any): Promise<number>;
+interface ProcessTree {
+    pid: number;
+    children: ProcessTree[];
+}
+export declare function getProcessName(pid: number): Promise<string>;
+export declare function getPidByPort(port: number): Promise<number>;
 export declare function getProcessCpuUseByPid(pid: number): Promise<number>;
 export declare function getProcessCommandByPid(pid: number): Promise<string>;
 export declare function isProcessDied(pid: number): Promise<boolean>;
 export declare function getProcessByPpid(pid: number): Promise<number[]>;
-export declare const getProcessTree: (pid: number, tree?: any) => Promise<any>;
-export declare const getProcessList: (pid: any) => Promise<number[]>;
+export declare const getProcessTree: (pid: number, tree?: ProcessTree) => Promise<ProcessTree | null>;
+export declare const getProcessList: (pid: number) => Promise<number[]>;
 export declare function SIGKILL(pid: number, signal?: number, times?: number): Promise<{
     success: boolean;
     error: string;
@@ -15,4 +19,5 @@ export declare const getAudioCards: (filter?: string) => Promise<{
     text: string;
     index: string;
 }[]>;
-export declare const getDiskUsage: () => Promise<import("./p-process-type").DiskInfo[]>;
+export declare const getDiskUsage: () => Promise<unknown[]>;
+export {};

package/lib/child-process/index.js

@@ -52,10 +52,7 @@ const getProcessTree = async (pid, tree) => {
     if (isRoot) {
         return tree;
     }
-    else {
-        tree = null;
-        return null;
-    }
+    return null;
 };
 exports.getProcessTree = getProcessTree;
 // 广度优先遍历进程树，将pid放入tmp
@@ -64,20 +61,17 @@ const flatProcessTree = (tree, tmp) => {
         tmp.push(...tree.children.map((item) => item.pid));
         tree.children.forEach((item) => flatProcessTree(item, tmp));
     }
-    tree = null;
-    tmp = null;
 };
 // 获取所有进程PID,从叶到根
 const getProcessList = async (pid) => {
-    let tree = await (0, exports.getProcessTree)(pid);
+    const tree = await (0, exports.getProcessTree)(pid);
     const tmp = [];
-    if (!tree.pid) {
+    if (!tree?.pid) {
         return tmp;
     }
     tmp.push(tree.pid);
     flatProcessTree(tree, tmp);
     tmp.reverse();
-    tree = null;
     return tmp;
 };
 exports.getProcessList = getProcessList;
@@ -92,7 +86,7 @@ const heartbeat = () => {
     }
     (0, pubo_utils_1.loop)(async () => {
         await new Promise((resolve) => {
-            process.send({ type: 'beat', timestamp: new Date().valueOf() }, resolve);
+            process.send({ type: 'beat', timestamp: Date.now() }, resolve);
         });
     }, 6000);
 };

package/lib/child-process/linux.d.ts

@@ -1,8 +1,8 @@
-import { PProcess } from './p-process-type';
+import { PProcess, DiskInfo } from './p-process-type';
 export declare class PProcessLinux implements PProcess {
     private _SIGKILL;
-    getProcessName(pid: any): Promise<string>;
-    getPidByPort(port: any): Promise<number>;
+    getProcessName(pid: number): Promise<string>;
+    getPidByPort(port: number): Promise<number>;
     getProcessCpuUseByPid(pid: number): Promise<number>;
     getProcessCommandByPid(pid: number): Promise<string>;
     isProcessDied(pid: number): Promise<boolean>;
@@ -11,7 +11,7 @@ export declare class PProcessLinux implements PProcess {
         success: boolean;
         error: string;
     }>;
-    getDiskUsage(): Promise<any>;
+    getDiskUsage(): Promise<DiskInfo[]>;
     getAudioCards(filter?: string): Promise<{
         text: string;
         index: string;

package/lib/child-process/linux.js

@@ -16,7 +16,7 @@ class PProcessLinux {
                 timeout: 4000,
             });
         }
-        catch (err) {
+        catch {
             await this._SIGKILL(pid, 9, times + 1);
         }
     }
@@ -27,7 +27,7 @@ class PProcessLinux {
                     reject(err);
                 }
                 else {
-                    resolve(data.toString().split(':')[1]?.trim());
+                    resolve(data.toString().split(':')[1]?.trim() ?? '');
                 }
             });
         });
@@ -39,16 +39,13 @@ class PProcessLinux {
                     reject(err);
                 }
                 else {
-                    let res = stdout.split('\n')[1];
-                    if (res) {
-                        res = res.trim();
-                    }
-                    res = parseInt(res);
-                    if (isNaN(res)) {
-                        reject('process not found');
+                    const res = stdout.split('\n')[1]?.trim();
+                    const pid = parseInt(res ?? '', 10);
+                    if (isNaN(pid)) {
+                        reject(new Error('process not found'));
                         return;
                     }
-                    resolve(res);
+                    resolve(pid);
                 }
             });
         });
@@ -72,7 +69,7 @@ class PProcessLinux {
                     resolve('');
                 }
                 else {
-                    resolve(stdout.toString().split('\n')[0]);
+                    resolve(stdout.toString().split('\n')[0] ?? '');
                 }
             });
         });
@@ -83,18 +80,17 @@ class PProcessLinux {
     }
     getProcessByPpid(pid) {
         return new Promise((resolve) => {
-            let child = (0, child_process_1.exec)(`ps -o pid --no-headers --ppid ${pid}`, (err, stdout) => {
+            (0, child_process_1.exec)(`ps -o pid --no-headers --ppid ${pid}`, (err, stdout) => {
                 if (err) {
                     resolve([]);
-                    child = null;
                 }
                 else {
-                    resolve(stdout
+                    const pidList = stdout
                         .split('\n')
                         .filter((item) => !!item)
                         .map((item) => parseFloat(item.trim()))
-                        .filter((item) => item !== child.pid));
-                    child = null;
+                        .filter((item) => !isNaN(item));
+                    resolve(pidList);
                 }
             });
         });
@@ -107,7 +103,7 @@ class PProcessLinux {
                 await this._SIGKILL(item, signal, times);
             }
             catch (err) {
-                res.error = err;
+                res.error = String(err);
                 res.success = false;
             }
         }
@@ -120,7 +116,7 @@ class PProcessLinux {
                     resolve([]);
                 }
                 else {
-                    resolve(parser(stdout.toString()));
+                    resolve(parseDiskUsage(stdout.toString()));
                 }
             });
         });
@@ -145,26 +141,36 @@ class PProcessLinux {
 }
 exports.PProcessLinux = PProcessLinux;
 const parseAudioCard = (v) => {
-    let card = /card \d/.exec(v) ?? ['card 1'];
-    card = parseInt(card[0].replace('card ', ''), 10);
-    let device = /device \d/.exec(v) ?? ['device 0'];
-    device = parseInt(device[0].replace('device ', ''), 10);
+    const cardMatch = /card (\d+)/.exec(v) ?? ['card 1', '1'];
+    const deviceMatch = /device (\d+)/.exec(v) ?? ['device 0', '0'];
+    const card = parseInt(cardMatch[1], 10);
+    const device = parseInt(deviceMatch[1], 10);
     return { text: v, index: `hw:${card},${device}` };
 };
-const dic = ['fileSystem', 'size', 'used', 'avail', 'usedPercent', 'mounted'];
-const parser = (str) => {
+const parseDiskUsage = (str) => {
+    const keys = ['fileSystem', 'size', 'used', 'avail', 'usePercent', 'mounted'];
     return str
         .split('\n')
         .filter((item) => item)
-        .map((item) => item.split(' ').filter((s) => !!s))
         .map((item) => {
-        const res = {};
-        dic.forEach((key, i) => (res[key] = item[i]));
-        return res;
-    })
-        .map((item) => ({
-        ...item,
-        total: parseFloat(item.size),
-        percentage: parseFloat(item['use%']),
-    }));
+        const values = item.split(' ').filter((s) => !!s);
+        const raw = {
+            fileSystem: values[0] ?? '',
+            size: values[1] ?? '',
+            used: values[2] ?? '',
+            avail: values[3] ?? '',
+            usePercent: values[4] ?? '',
+            mounted: values[5] ?? '',
+        };
+        return {
+            fileSystem: raw.fileSystem,
+            size: parseFloat(raw.size),
+            used: parseFloat(raw.used),
+            avail: parseFloat(raw.avail),
+            usedPercent: parseFloat(raw.usePercent.replace('%', '')),
+            mounted: raw.mounted,
+            total: parseFloat(raw.size),
+            percentage: parseFloat(raw.usePercent.replace('%', '')),
+        };
+    });
 };

package/lib/child-process/p-process-type.d.ts

@@ -1,6 +1,6 @@
 export interface PidTree {
     pid: number;
-    children: PidTree;
+    children: PidTree[];
 }
 export interface DiskInfo {
     fileSystem: string;
@@ -8,7 +8,9 @@ export interface DiskInfo {
     used: number;
     avail: number;
     usedPercent: number;
-    mounted: number;
+    mounted: string;
+    total?: number;
+    percentage?: number;
 }
 export interface PProcess {
     getProcessName(pid: number): Promise<string>;

package/lib/child-process/win32.d.ts

@@ -1,15 +1,18 @@
-import { PProcess } from './p-process-type';
+import { PProcess, DiskInfo } from './p-process-type';
 export declare class PProcessWin32 implements PProcess {
-    getProcessName(pid: any): Promise<string>;
-    getPidByPort(port: any): Promise<number>;
+    getProcessName(pid: number): Promise<string>;
+    getPidByPort(port: number): Promise<number>;
     getProcessCpuUseByPid(pid: number): Promise<number>;
     getProcessCommandByPid(pid: number): Promise<string>;
     isProcessDied(pid: number): Promise<boolean>;
     getProcessByPpid(ppid: number): Promise<number[]>;
-    SIGKILL(pid: number, signal?: number, times?: number): Promise<{
+    SIGKILL(pid: number): Promise<{
         success: boolean;
         error: string;
     }>;
-    getDiskUsage(): Promise<any>;
-    getAudioCards(): Promise<never[]>;
+    getDiskUsage(): Promise<DiskInfo[]>;
+    getAudioCards(): Promise<{
+        text: string;
+        index: string;
+    }[]>;
 }

package/lib/child-process/win32.js

@@ -16,7 +16,7 @@ class PProcessWin32 {
                         resolve(match[1]);
                     }
                     else {
-                        reject('process not found');
+                        reject(new Error('process not found'));
                     }
                 }
             });
@@ -31,17 +31,17 @@ class PProcessWin32 {
                 }
                 const arr = stdout.split('\n');
                 if (!arr[0]) {
-                    reject('process not found');
+                    reject(new Error('process not found'));
                     return;
                 }
                 const tmp = arr[0].split(' ');
-                let res = tmp.pop();
-                res = parseInt(res);
-                if (isNaN(res)) {
-                    reject('process not found');
+                const res = tmp.pop();
+                const pid = parseInt(res ?? '', 10);
+                if (isNaN(pid)) {
+                    reject(new Error('process not found'));
                     return;
                 }
-                resolve(res);
+                resolve(pid);
             });
         });
     }
@@ -54,10 +54,10 @@ class PProcessWin32 {
                 }
                 const match = stdout.match(/\d+\s+(\d+)/);
                 if (!match) {
-                    reject('Process not found');
+                    reject(new Error('Process not found'));
                     return;
                 }
-                resolve(parseInt(match[1]));
+                resolve(parseInt(match[1], 10));
             });
         });
     }
@@ -70,7 +70,7 @@ class PProcessWin32 {
                 }
                 const match = stdout.match(/CommandLine=(.*)/);
                 if (!match) {
-                    reject('Process not found');
+                    reject(new Error('Process not found'));
                     return;
                 }
                 resolve(match[1].trim());
@@ -93,7 +93,7 @@ class PProcessWin32 {
                 for (const line of lines) {
                     const match = line.match(/ProcessId=(\d+)/);
                     if (match) {
-                        const pid = parseInt(match[1]);
+                        const pid = parseInt(match[1], 10);
                         if (!isNaN(pid)) {
                             pids.push(pid);
                         }
@@ -103,10 +103,10 @@ class PProcessWin32 {
             });
         });
     }
-    async SIGKILL(pid, signal, times) {
+    async SIGKILL(pid) {
         return new Promise((resolve) => {
             (0, child_process_1.exec)(`taskkill /pid ${pid} /T /F`, (err) => {
-                resolve({ success: true, error: err.toString() });
+                resolve({ success: true, error: err?.toString() ?? '' });
             });
         });
     }
@@ -118,36 +118,32 @@ class PProcessWin32 {
                     return;
                 }
                 const lines = stdout.split('\r\n').filter((line) => line.trim() !== '');
-                // format:csv output has a header line "Node,Caption,FreeSpace,Size" usually.
-                // It might also have empty lines.
                 const disks = lines
                     .map((line) => {
-                    // CSV parsing: simple split by comma
                     const parts = line.split(',').map((s) => s.trim());
                     if (parts.length < 4)
-                        return null; // Node, Caption, FreeSpace, Size
-                    // Header check
+                        return null;
                     if (parts[1] === 'Caption')
                         return null;
                     const caption = parts[1];
-                    const freeSpace = parseInt(parts[2]);
-                    const size = parseInt(parts[3]);
+                    const freeSpace = parseInt(parts[2], 10);
+                    const size = parseInt(parts[3], 10);
                     if (isNaN(size) || isNaN(freeSpace))
                         return null;
                     const used = size - freeSpace;
                     const usedPercent = size > 0 ? (used / size) * 100 : 0;
                     return {
                         fileSystem: caption,
-                        size: size, // bytes
-                        used: used,
+                        size,
+                        used,
                         avail: freeSpace,
-                        usedPercent: `${usedPercent.toFixed(0)}%`,
+                        usedPercent: usedPercent,
                         mounted: caption,
                         total: size,
-                        percentage: parseFloat(usedPercent.toFixed(0)),
+                        percentage: Math.round(usedPercent),
                     };
                 })
-                    .filter((item) => item);
+                    .filter((item) => item !== null);
                 resolve(disks);
             });
         });

package/lib/ftp-client/index.d.ts

@@ -11,7 +11,17 @@ export interface FtpConnectOptions {
     user: string;
     host: string;
     password: string;
-    driver: any;
+    driver: new () => FtpDriver;
+}
+interface FtpDriver {
+    once(event: 'ready' | 'error', listener: (err?: Error) => void): this;
+    connect(options: Record<string, string>): this;
+    end(): void;
+    get(path: string, callback: (err: Error | null, stream: NodeJS.ReadableStream) => void): void;
+    put(input: string | Buffer | Stream, path: string, callback: (err: Error | null, result: string) => void): void;
+    delete(path: string, callback: (err: Error | null, result: string) => void): void;
+    list(path: string, callback: (err: Error | null, list: FtpFile[]) => void): void;
+    rename(oldPath: string, newPath: string, callback: (err: Error | null, result: string) => void): void;
 }
 type GetFile = (path: string) => Promise<Buffer>;
 type PutFile = (input: string | Buffer | Stream, path: string) => Promise<string>;
@@ -31,19 +41,19 @@ export declare class FtpClient implements FtpClientInterface {
     private readonly state;
     private client;
     private _len;
-    id: string;
+    readonly id: string;
     constructor({ driver, ...options }: FtpConnectOptions);
     get len(): number;
     set len(n: number);
-    put: (...args: any[]) => Promise<any>;
-    delete: (...args: any[]) => Promise<any>;
-    list: (...args: any[]) => Promise<any>;
-    rename: (...args: any[]) => Promise<any>;
+    put: PutFile;
+    delete: DeleteFile;
+    list: ListFiles;
+    rename: RenameFile;
     private connect;
     private close;
     private run;
     private bind;
-    get(...args: any[]): Promise<Buffer>;
+    get(path: string): Promise<Buffer>;
 }
 export declare class FtpClientPool implements FtpClientInterface {
     private readonly options;
@@ -52,11 +62,11 @@ export declare class FtpClientPool implements FtpClientInterface {
     constructor({ maxConnection, ...options }: {
         maxConnection?: number;
     } & FtpConnectOptions);
-    get: (...args: any[]) => Promise<any>;
-    put: (...args: any[]) => Promise<any>;
-    delete: (...args: any[]) => Promise<any>;
-    list: (...args: any[]) => Promise<any>;
-    rename: (...args: any[]) => Promise<any>;
+    get: GetFile;
+    put: PutFile;
+    delete: DeleteFile;
+    list: ListFiles;
+    rename: RenameFile;
     get len(): number;
     private get client();
     private bind;

package/lib/ftp-client/index.js

@@ -6,7 +6,7 @@ class FtpClient {
     driver;
     options;
     state = { running: false, connected: false, destroyed: false, connecting: false };
-    client;
+    client = null;
     _len = 0;
     id = (0, pubo_utils_1.random)();
     constructor({ driver, ...options }) {
@@ -46,11 +46,11 @@ class FtpClient {
                 reject(err);
                 this.close();
             });
-            this.client.connect({ ...this.options });
+            this.client.connect(this.options);
         });
     }
     close() {
-        this.client.end();
+        this.client?.end();
         this.state.connected = false;
         this.state.destroyed = true;
         this.state.connecting = false;
@@ -84,11 +84,12 @@ class FtpClient {
             return res;
         };
     }
-    async get(...args) {
+    async get(path) {
         let res = Buffer.alloc(0);
-        const stream = await this.run({ fn: 'get', args });
-        return new Promise((resolve) => {
+        const stream = await this.run({ fn: 'get', args: [path] });
+        return new Promise((resolve, reject) => {
             stream.on('data', (chunk) => {
+                // @ts-ignore
                 res = Buffer.concat([res, chunk], res.byteLength + chunk.byteLength);
             });
             stream.on('end', () => {
@@ -96,6 +97,7 @@ class FtpClient {
                 this.state.running = false;
                 this.len -= 1;
             });
+            stream.on('error', reject);
         });
     }
 }

package/lib/grpc/index.d.ts

@@ -1,10 +1,33 @@
-export interface CreateClientProps {
+export interface CreateClientProps<T = unknown> {
     url: string;
-    options?: any;
-    ServiceImp: any;
-    Grpc: any;
+    options?: GrpcClientOptions;
+    ServiceImp: new (impl: {
+        request: GrpcRequestFn;
+    }) => T;
+    Grpc: GrpcStatic;
     cert?: Buffer;
 }
+interface GrpcClientOptions {
+    'grpc.max_send_message_length'?: number;
+    'grpc.max_receive_message_length'?: number;
+    timeout?: number;
+}
+interface GrpcCredentials {
+    createSsl(cert?: Buffer): GrpcCredentials;
+    createInsecure(): GrpcCredentials;
+}
+interface GrpcClientStatic {
+    new (address: string, credentials: GrpcCredentials, options: GrpcClientOptions): GrpcClientInstance;
+}
+interface GrpcClientInstance {
+    close(): void;
+    makeUnaryRequest(path: string, serialize: (obj: unknown) => Buffer, deserialize: (bytes: Buffer) => unknown, data: Buffer, callback: (err: Error | null, response: Buffer) => void): void;
+}
+type GrpcRequestFn = (service: string, method: string, data?: unknown) => Promise<Buffer>;
+interface GrpcStatic {
+    credentials: GrpcCredentials;
+    Client: GrpcClientStatic;
+}
 declare class GrpcClient {
     private readonly url;
     private readonly options;
@@ -13,15 +36,16 @@ declare class GrpcClient {
     private client;
     private _timeout;
     connections: number;
-    constructor({ url, options, Grpc, cert }: any);
-    request(service: any, method: any, data: any): Promise<Buffer>;
-    _request({ service, method, data }: {
-        service: any;
-        method: any;
-        data: any;
-    }): Promise<Buffer>;
+    constructor({ url, options, Grpc, cert, }: {
+        url: string;
+        options?: GrpcClientOptions;
+        Grpc: GrpcStatic;
+        cert?: Buffer;
+    });
+    request(service: string, method: string, data?: unknown): Promise<Buffer>;
+    private _request;
     close(): void;
 }
 export declare const GrpcList: GrpcClient[];
-export declare function createRpcClient<T>({ url, options, ServiceImp, Grpc, cert }: CreateClientProps): T;
+export declare function createRpcClient<T>({ url, options, ServiceImp, Grpc, cert }: CreateClientProps<T>): T;
 export {};

package/lib/grpc/index.js

@@ -8,20 +8,21 @@ class GrpcClient {
     options;
     Grpc;
     credentials;
-    client;
-    _timeout;
+    client = null;
+    _timeout = null;
     connections = 0;
-    constructor({ url, options = {}, Grpc, cert }) {
-        const opt = { 'grpc.max_send_message_length': -1, 'grpc.max_receive_message_length': -1, ...options };
+    constructor({ url, options = {}, Grpc, cert, }) {
+        const opt = {
+            'grpc.max_send_message_length': -1,
+            'grpc.max_receive_message_length': -1,
+            ...options,
+        };
         const credentials = cert ? Grpc.credentials.createSsl(cert) : Grpc.credentials.createInsecure();
         this.url = url;
         this.Grpc = Grpc;
         this.credentials = credentials;
         this.options = opt;
-        this.options.timeout = this.options.timeout ?? 10000;
-        Grpc = null;
-        options = null;
-        cert = null;
+        this.options.timeout ??= 10000;
     }
     async request(service, method, data) {
         if (this._timeout) {
@@ -32,7 +33,7 @@ class GrpcClient {
         if (!this.client) {
             this.client = new this.Grpc.Client(this.url, this.credentials, this.options);
         }
-        let error;
+        let error = null;
         let result = Buffer.alloc(0);
         try {
             result = await this._request({ service, method, data });
@@ -40,9 +41,6 @@ class GrpcClient {
         catch (err) {
             error = err;
         }
-        service = null;
-        method = null;
-        data = null;
         this.connections -= 1;
         if (this.connections < 0) {
             this.connections = 0;
@@ -50,7 +48,6 @@ class GrpcClient {
         if (this.connections < 1) {
             if (this._timeout) {
                 clearTimeout(this._timeout);
-                this._timeout = null;
             }
             this._timeout = setTimeout(() => this.close(), 60000);
         }
@@ -63,20 +60,18 @@ class GrpcClient {
     }
     _request({ service, method, data }) {
         return new Promise((resolve, reject) => {
-            let _ended = false;
-            const _timeout = setTimeout(() => {
-                _ended = true;
+            let ended = false;
+            const timeout = setTimeout(() => {
+                ended = true;
                 this.close();
                 console.log('rpc request timeout');
                 reject(new Error('timeout'));
             }, this.options.timeout);
             const onResponse = (err, res) => {
-                if (_ended) {
+                if (ended) {
                     return;
                 }
-                else {
-                    clearTimeout(_timeout);
-                }
+                clearTimeout(timeout);
                 if (err) {
                     reject(err);
                 }
@@ -84,24 +79,21 @@ class GrpcClient {
                     resolve(res);
                 }
             };
-            this.client.makeUnaryRequest(`/${service}/${method}`, passThrough, passThrough, data ? Buffer.from(data) : Buffer.alloc(0), onResponse);
+            this.client.makeUnaryRequest(`/${service}/${method}`, passThrough, passThrough, data ? Buffer.from(JSON.stringify(data)) : Buffer.alloc(0), onResponse);
         });
     }
     close() {
         if (this._timeout) {
             clearTimeout(this._timeout);
-            delete this._timeout;
+            this._timeout = null;
         }
         this.client?.close();
         this.client = null;
-        delete this.client;
     }
 }
 exports.GrpcList = [];
-function createRpcClient({ url, options = {}, ServiceImp, Grpc, cert }) {
+function createRpcClient({ url, options, ServiceImp, Grpc, cert }) {
     const client = new GrpcClient({ url, options, Grpc, cert });
     exports.GrpcList.push(client);
-    Grpc = null;
-    options = null;
     return new ServiceImp({ request: client.request.bind(client) });
 }

package/lib/index.d.ts

@@ -7,4 +7,3 @@ export { SIGKILL, isProcessDied, getProcessName, getProcessTree, getProcessByPpi
 export { getWifiName, getNetworks } from './utils/network';
 export { RosTopicManager, RosTopic } from './ros/topic';
 export { PProcess } from './child-process/p-process';
-export { PuboFileSystem } from './file-system';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PuboFileSystem = exports.PProcess = exports.RosTopic = exports.RosTopicManager = exports.getNetworks = exports.getWifiName = exports.getDiskUsage = exports.heartbeat = exports.getPidByPort = exports.getProcessList = exports.getProcessCommandByPid = exports.getProcessCpuUseByPid = exports.getProcessByPpid = exports.getProcessTree = exports.getProcessName = exports.isProcessDied = exports.SIGKILL = exports.isPortAvailable = exports.GrpcList = exports.createRpcClient = exports.FtpClientPool = exports.FtpClient = exports.JsonStorage = void 0;
+exports.PProcess = exports.RosTopic = exports.RosTopicManager = exports.getNetworks = exports.getWifiName = exports.getDiskUsage = exports.heartbeat = exports.getPidByPort = exports.getProcessList = exports.getProcessCommandByPid = exports.getProcessCpuUseByPid = exports.getProcessByPpid = exports.getProcessTree = exports.getProcessName = exports.isProcessDied = exports.SIGKILL = exports.isPortAvailable = exports.GrpcList = exports.createRpcClient = exports.FtpClientPool = exports.FtpClient = exports.JsonStorage = void 0;
 var json_1 = require("./storage/json");
 Object.defineProperty(exports, "JsonStorage", { enumerable: true, get: function () { return json_1.JsonStorage; } });
 var ftp_client_1 = require("./ftp-client");
@@ -31,5 +31,3 @@ Object.defineProperty(exports, "RosTopicManager", { enumerable: true, get: funct
 Object.defineProperty(exports, "RosTopic", { enumerable: true, get: function () { return topic_1.RosTopic; } });
 var p_process_1 = require("./child-process/p-process");
 Object.defineProperty(exports, "PProcess", { enumerable: true, get: function () { return p_process_1.PProcess; } });
-var file_system_1 = require("./file-system");
-Object.defineProperty(exports, "PuboFileSystem", { enumerable: true, get: function () { return file_system_1.PuboFileSystem; } });

package/lib/ros/topic.d.ts

@@ -1,20 +1,22 @@
 import { Emitter } from 'pubo-utils';
 export declare class RosTopic {
-    topic: string;
-    messageType: string;
-    emitter: Emitter;
+    readonly topic: string;
+    readonly messageType: string;
+    readonly emitter: Emitter;
     private subscribed;
     private readonly dog;
     private readonly strSplit;
     private subscribeChildProcess;
-    constructor(topic: any, messageType: any);
+    constructor(topic: string, messageType: string);
+    get isSubscribed(): boolean;
     private onTimeout;
     private onData;
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
-    publish(payload: any): Promise<unknown>;
+    publish(payload: unknown): Promise<string>;
 }
-export declare const RosTopicManager: {
-    cache: never[];
-    getTopic: (topic: any, messageType: any) => RosTopic;
-};
+export interface RosTopicManagerType {
+    cache: RosTopic[];
+    getTopic(topic: string, messageType: string): RosTopic;
+}
+export declare const RosTopicManager: RosTopicManagerType;

package/lib/ros/topic.js

@@ -35,13 +35,16 @@ class RosTopic {
     subscribed = false;
     dog = new pubo_utils_1.WatchDog({ limit: 10, onTimeout: this.onTimeout.bind(this) });
     strSplit = new pubo_utils_1.StringSplit('---');
-    subscribeChildProcess;
+    subscribeChildProcess = null;
     constructor(topic, messageType) {
         this.topic = topic;
         this.messageType = messageType;
         this.subscribed = false;
         this.emitter = new pubo_utils_1.Emitter();
     }
+    get isSubscribed() {
+        return this.subscribed;
+    }
     async onTimeout() {
         await this.unsubscribe();
         await (0, pubo_utils_1.sleep)(1000);
@@ -62,9 +65,9 @@ class RosTopic {
         }
         this.subscribed = true;
         this.dog.init();
-        this.subscribeChildProcess = (0, child_process_1.spawn)(`rostopic`, ['echo', this.topic]);
-        this.subscribeChildProcess.stdout.on('data', this.onData.bind(this));
-        this.subscribeChildProcess.stderr.on('data', (buf) => console.log(buf.toString()));
+        this.subscribeChildProcess = (0, child_process_1.spawn)('rostopic', ['echo', this.topic]);
+        this.subscribeChildProcess.stdout?.on('data', this.onData.bind(this));
+        this.subscribeChildProcess.stderr?.on('data', (buf) => console.log(buf.toString()));
     }
     async unsubscribe() {
         if (!this.subscribeChildProcess) {
@@ -92,7 +95,7 @@ class RosTopic {
 exports.RosTopic = RosTopic;
 exports.RosTopicManager = {
     cache: [],
-    getTopic: function (topic, messageType) {
+    getTopic(topic, messageType) {
         const tmp = this.cache.find((item) => item.topic === topic);
         if (tmp) {
             return tmp;

package/lib/storage/json.d.ts

@@ -1,6 +1,6 @@
 export interface JsonStorageOptions {
-    initialState?: any;
-    defaultState?: any;
+    initialState?: Record<string, unknown>;
+    defaultState?: Record<string, unknown>;
 }
 export declare class JsonStorage {
     private readonly instance;
@@ -8,8 +8,8 @@ export declare class JsonStorage {
     constructor(path: string, options?: JsonStorageOptions);
     private getState;
     private setState;
-    get(key?: string): Promise<any>;
-    set(key: string, values: any): Promise<void>;
-    merge(values: any): Promise<void>;
+    get(key?: string): Promise<unknown>;
+    set(key: string, values: unknown): Promise<void>;
+    merge(values: Record<string, unknown>): Promise<void>;
     remove(key: string): Promise<void>;
 }

package/lib/storage/json.js

@@ -4,8 +4,6 @@ exports.JsonStorage = void 0;
 const fs_1 = require("fs");
 const pubo_utils_1 = require("pubo-utils");
 const uuid_1 = require("uuid");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const cluster = require('cluster');
 // 主线程的实现
 class Manager {
     path;
@@ -13,20 +11,20 @@ class Manager {
     queue = new pubo_utils_1.SyncQueue();
     key;
     defaultState;
-    constructor(path, defaultState) {
+    constructor(path, defaultState, clusterModule) {
         this.path = path;
         this.defaultState = defaultState;
         this.key = encodeURIComponent(path);
-        cluster.on('online', (worker) => {
-            worker.on('message', (message) => {
-                this.onMessage(message, worker);
-                message = null;
+        if (clusterModule) {
+            clusterModule.on('online', (worker) => {
+                worker.on('message', (message) => {
+                    this.onMessage(message, worker);
+                });
             });
-        });
-        cluster.on('exit', (worker) => {
-            worker.removeAllListeners('message');
-            worker = null;
-        });
+            clusterModule.on('exit', (worker) => {
+                worker.removeAllListeners('message');
+            });
+        }
         this.restore();
         if (global.GlobalEmitter) {
             global.GlobalEmitter.on('SIGINT', this.kill.bind(this));
@@ -49,12 +47,10 @@ class Manager {
         if (message.type === 'get') {
             payload = await this.getState();
         }
-        else if (message.type === 'set') {
+        else if (message.type === 'set' && message.payload) {
             payload = await this.setState(message.payload);
         }
         worker.send({ uid: message.uid, key: this.key, payload });
-        message = null;
-        worker = null;
     }
     sync() {
         if (this.queue.length > 0) {
@@ -84,9 +80,9 @@ class Manager {
             const buf = (0, fs_1.readFileSync)(this.path);
             this._state = JSON.parse(buf.toString());
         }
-        catch (err) {
-            const str = process.platform === 'win32' ? '\\' : '/';
-            const folder = this.path.split(str).slice(0, -1).join(str);
+        catch {
+            const separator = process.platform === 'win32' ? '\\' : '/';
+            const folder = this.path.split(separator).slice(0, -1).join(separator);
             if (folder) {
                 (0, fs_1.mkdirSync)(folder, { recursive: true });
             }
@@ -113,35 +109,33 @@ class Worker {
         if (message.key !== this.key) {
             return;
         }
-        if (typeof this.callback[message.uid] === 'function') {
+        if (message.uid && typeof this.callback[message.uid] === 'function') {
             this.callback[message.uid](message.payload);
             delete this.callback[message.uid];
         }
-        message = null;
     }
     async call({ type, payload }) {
         return new Promise((resolve) => {
             const uid = (0, uuid_1.v4)();
             this.callback[uid] = (data) => resolve(data);
-            //@ts-ignore
             process.send({ uid, type, payload, key: this.key });
-            payload = null;
-            type = null;
         });
     }
     async getState() {
-        return this.call({ type: 'get', payload: {} });
+        return (await this.call({ type: 'get', payload: {} }));
     }
     async setState(payload) {
-        return this.call({ type: 'set', payload });
+        await this.call({ type: 'set', payload });
     }
 }
 class JsonStorage {
     instance;
     queue = new pubo_utils_1.SyncQueue();
     constructor(path, options = {}) {
-        if (cluster.isPrimary) {
-            this.instance = new Manager(path, options.defaultState);
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const clusterModule = require('cluster');
+        if (clusterModule.isPrimary) {
+            this.instance = new Manager(path, options.defaultState, clusterModule);
         }
         else {
             this.instance = new Worker(path);
@@ -160,10 +154,8 @@ class JsonStorage {
         if (!key) {
             return this.getState();
         }
-        else {
-            const state = await this.getState();
-            return state[key];
-        }
+        const state = await this.getState();
+        return state[key];
     }
     async set(key, values) {
         const state = await this.getState();

package/lib/utils/index.d.ts

@@ -1 +1 @@
-export declare const isPortAvailable: (port: any) => Promise<unknown>;
+export declare const isPortAvailable: (port: number) => Promise<boolean>;

package/lib/utils/network.d.ts

@@ -1,2 +1,8 @@
-export declare function getNetworks(): Promise<any[]>;
-export declare function getWifiName(): Promise<any>;
+interface NetworkInfo {
+    description?: string;
+    'logical name'?: string;
+    [key: string]: string | undefined;
+}
+export declare function getNetworks(): Promise<NetworkInfo[]>;
+export declare function getWifiName(): Promise<string>;
+export {};

package/lib/utils/network.js

@@ -27,6 +27,9 @@ async function getNetworks() {
         child.stdout?.on('data', (data) => {
             resolve(parseNetworkData(data));
         });
+        child.on('error', () => {
+            resolve([]);
+        });
     });
 }
 async function getWifiName() {
@@ -35,5 +38,5 @@ async function getWifiName() {
     if (!wifi) {
         return '';
     }
-    return wifi['logical name'];
+    return wifi['logical name'] ?? '';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubo-node",
-  "version": "1.0.206",
+  "version": "1.0.207",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "sideEffects": false,
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@types/node": "^17.0.25",
-    "pubo-utils": "^1.0.206",
+    "pubo-utils": "^1.0.207",
     "yaml": "^2.5.1"
   },
-  "gitHead": "f26d7016b8a957cfab489dc831cf3052db2f87ea",
+  "gitHead": "f785821fb5a3ec8f9c7db2c3b818108dc9139ea2",
   "devDependencies": {
     "del": "^5.1.0",
     "eslint": "^8.42.0",

package/lib/file-system/index.d.ts

@@ -1,22 +0,0 @@
-import type EventEmitter from 'events';
-import * as fs from 'fs';
-interface PuboFileSystemInterface {
-    read: <TBuffer extends NodeJS.ArrayBufferView>(fd: number, buffer?: TBuffer, offset?: number, length?: number, position?: fs.ReadPosition | null) => Promise<[number, TBuffer]>;
-    stat: (path: fs.PathLike) => Promise<fs.Stats>;
-    readFile: (path: fs.PathOrFileDescriptor, options?: ({
-        encoding?: null;
-        flag?: string;
-    } & EventEmitter.Abortable) | null) => Promise<Buffer>;
-    writeFile: (file: fs.PathOrFileDescriptor, data: string | NodeJS.ArrayBufferView, options?: fs.WriteFileOptions) => Promise<void>;
-    readdir: (path: fs.PathLike, options?: BufferEncoding | {
-        encoding: BufferEncoding | null;
-        withFileTypes: false;
-    } | null) => Promise<string[]>;
-    open: (path: fs.PathLike, flags?: fs.OpenMode, mode?: fs.Mode | null) => Promise<number>;
-    close: (fd: number) => Promise<void>;
-    mkdir: (path: fs.PathLike, options?: fs.MakeDirectoryOptions) => Promise<void>;
-    rm: (path: fs.PathLike) => Promise<void>;
-    write: <TBuffer extends NodeJS.ArrayBufferView>(fd: number, buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null) => Promise<void>;
-}
-export declare const PuboFileSystem: PuboFileSystemInterface;
-export {};

package/lib/file-system/index.js

@@ -1,54 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PuboFileSystem = void 0;
-const fs = __importStar(require("fs"));
-const callback2promise = (fn) => {
-    return (...args) => new Promise((resolve, reject) => {
-        fn(...args, (err, ...rest) => {
-            if (err) {
-                reject(err);
-            }
-            if (rest.length < 2) {
-                resolve(rest[0]);
-            }
-            else {
-                resolve([...rest]);
-            }
-        });
-    });
-};
-exports.PuboFileSystem = {
-    read: callback2promise(fs.read),
-    readFile: callback2promise(fs.readFile),
-    writeFile: callback2promise(fs.writeFile),
-    readdir: callback2promise(fs.readdir),
-    open: callback2promise(fs.open),
-    close: callback2promise(fs.close),
-    write: callback2promise(fs.write),
-    stat: callback2promise(fs.stat),
-    mkdir: callback2promise(fs.mkdir),
-    rm: callback2promise(fs.rm),
-};