@talex-touch/utils 1.0.10 → 1.0.11

package/base/index.ts

@@ -125,7 +125,7 @@ export enum SupportOS {
   WINDOWS = 'Windows',
   WINDOWS_11 = 'Windows 10 Pro',
   WINDOWS_10 = 'Windows 10',
-  
+
   MACOS = 'macOS',
   MACOS_SONOMA = 'macOS Sonoma',
   MACOS_MONTEREY = 'macOS Monterey',
@@ -154,7 +154,7 @@ export enum SupportOS {
   IPADOS = 'iPadOS',
   IPADOS_17 = 'iPadOS 17',
   IPADOS_16 = 'iPadOS 16',
-  
+
   WEB = 'Web',
   WEB_CHROME = 'Web Chrome',
   WEB_FIREFOX = 'Web Firefox',

package/channel/index.ts

@@ -10,7 +10,7 @@ export enum DataCode {
 }
 
 export interface ITouchChannel {
-  
+
   /**
    * Register a channel
    * @description Register a channel, and return a function to cancel the registration
@@ -30,7 +30,7 @@ export interface ITouchChannel {
 }
 
 export interface ITouchClientChannel {
-  
+
   /**
    * Register a channel
    * @description Register a channel, and return a function to cancel the registration
@@ -72,9 +72,10 @@ export interface RawChannelSyncData {
 }
 
 export interface RawChannelHeaderData {
-  status: 'reply' | 'request'
-  type: ChannelType
-  _originData?: any
+  status: "reply" | "request";
+  type: ChannelType;
+  _originData?: any;
+  event: Electron.IpcMainEvent | Electron.IpcRendererEvent;
 }
 
 export interface RawChannelData {
@@ -85,10 +86,14 @@ export interface RawChannelData {
 
 export interface RawStandardChannelData extends RawChannelData {
   code: DataCode
-  data?: any
+  data?: IChannelData
   plugin?: string
 }
 
 export interface StandardChannelData extends RawStandardChannelData {
-  reply: (code: DataCode, data: any) => void
+  reply: (code: DataCode, data: IChannelData) => void
+}
+
+export interface IChannelData {
+  [prop: string]: any
 }

package/common/env-tool.ts

@@ -0,0 +1,40 @@
+import { exec, ExecException } from 'child_process';
+
+export interface IGlobalPkgResult {
+  exist: boolean
+  error?: ExecException
+  name: string
+  version: string
+}
+
+export function checkGlobalPackageExist(packageName: string) {
+  return new Promise((resolve, reject) => {
+    exec(`npm list -g ${packageName}`, (error, stdout, stderr) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      if (stderr) {
+        reject(stderr);
+        return;
+      }
+
+      const lines = stdout.split('\n');
+      const lastLine = lines[lines.length - 2];
+      const match = lastLine.match(/(\S+)@(\S+)/);
+      if (match) {
+        resolve({
+          exist: true,
+          name: match[1],
+          version: match[2]
+        } as IGlobalPkgResult);
+        return;
+      }
+
+      resolve({
+        exist: false
+      }
+
+    });
+  })
+}

package/common/index.ts

@@ -11,8 +11,8 @@ export function anyStr2Num(str: string): BigInt {
 
         numbers.push(("" + e).padStart(5, "0"))
 
-        if ( minium > e ) minium = e
-        
+        if (minium > e) minium = e
+
     }
 
     // each number transform
@@ -28,7 +28,7 @@ export function num2anyStr(num: BigInt): string {
 
     let text = ''
 
-    for ( let i = 0; i < length; i++ ) {
+    for (let i = 0; i < length; i++) {
         const str = strs[1].slice(i * 2, i * 2 + 2)
 
         // strs[1] = strs[1].replace(str, (BigInt(+str) + BigInt(baseNum)).toString().padStart(5, "0"))
@@ -36,4 +36,4 @@ export function num2anyStr(num: BigInt): string {
     }
 
     return text
-}
+}

package/package.json

@@ -1,30 +1,30 @@
-{
-  "main": "./index.ts",
-  "name": "@talex-touch/utils",
-  "author": "TalexDreamSoul",
-  "module": "./index.ts",
-  "license": "MPL-2.0",
-  "private": false,
-  "version": "1.0.10",
-  "scripts": {
-    "publish": "npm publish --access public"
-  },
-  "keywords": [
-    "vue",
-    "electron",
-    "talex-touch"
-  ],
-  "repository": {
-    "url": "https://github.com/talex-touch/talex-touch.git",
-    "type": "git"
-  },
-  "description": "TalexTouch series utils",
-  "dependencies": {
-    "path-browserify": "^1.0.1",
-    "vue": "^3.3.4"
-  },
-  "peerDependencies": {
-    "electron": "^24.4.0",
-    "vue": "^3.2.47"
-  }
-}
+{
+  "main": "./index.ts",
+  "name": "@talex-touch/utils",
+  "author": "TalexDreamSoul",
+  "module": "./index.ts",
+  "license": "MPL-2.0",
+  "private": false,
+  "version": "1.0.11",
+  "scripts": {
+    "publish": "npm publish --access public"
+  },
+  "keywords": [
+    "vue",
+    "electron",
+    "talex-touch"
+  ],
+  "repository": {
+    "url": "https://github.com/talex-touch/talex-touch.git",
+    "type": "git"
+  },
+  "description": "TalexTouch series utils",
+  "dependencies": {
+    "path-browserify": "^1.0.1",
+    "vue": "^3.4.19"
+  },
+  "peerDependencies": {
+    "electron": "^24.4.0",
+    "vue": "^3.2.47"
+  }
+}

package/plugin/channel.ts

@@ -1,5 +1,5 @@
 // const { ipcRenderer, IpcMainEvent } = require("electron");
-import { ipcRenderer, IpcRendererEvent } from "electron";
+import { ipcRenderer, type IpcRendererEvent } from "electron";
 import {
   ChannelType,
   DataCode,
@@ -22,8 +22,8 @@ class TouchChannel implements ITouchClientChannel {
     ipcRenderer.on("@plugin-process-message", this.__handle_main.bind(this));
   }
 
-  __parse_raw_data(e: typeof IpcRendererEvent, arg: any): RawStandardChannelData | null {
-    console.log("Raw data: ", arg, e);
+  __parse_raw_data(e: IpcRendererEvent, arg: any): RawStandardChannelData | null {
+    console.debug("Raw data: ", arg, e);
     if (arg) {
       const { name, header, code, data, sync } = arg;
 
@@ -33,6 +33,7 @@ class TouchChannel implements ITouchClientChannel {
             status: header.status || "request",
             type: ChannelType.PLUGIN,
             _originData: arg,
+            event: e
           },
           sync,
           code,

package/plugin/index.ts

@@ -15,6 +15,8 @@ export enum PluginStatus {
 export interface IPluginIcon {
   type: string | 'remixicon' | 'class'
   value: any
+
+  init(): Promise<void>
 }
 
 export interface IPlatformInfo {
@@ -50,6 +52,12 @@ export interface ITouchPlugin extends IPluginBaseInfo {
   dev: IPluginDev
   webViewInit: boolean
   webview: IPluginWebview
+  features: IPluginFeature[]
+
+  addFeature(feature: IPluginFeature): boolean
+  delFeature(featureId: string): boolean
+  getFeature(featureId: string): IPluginFeature | null
+  getFeatures(): IPluginFeature[]
 
   get status(): PluginStatus
   set status(v: PluginStatus)
@@ -58,6 +66,22 @@ export interface ITouchPlugin extends IPluginBaseInfo {
   disable(): Promise<boolean>
 }
 
+export interface IFeatureCommand {
+  type: "match" | "contain" | "regex" | "function" | "over" | "image" | "files" | "directory" | "window"
+  value: string | string[] | RegExp | Function
+  onTrigger(): void
+}
+
+export interface IPluginFeature {
+  id: string
+  name: string
+  desc: string
+  icon: IPluginIcon
+  push: boolean
+  platform: IPlatform
+  commands: IFeatureCommand[]
+}
+
 export interface IPluginManager {
   plugins: Map<string, ITouchPlugin>
   active: string | null

package/plugin/sdk/common.ts

@@ -1,13 +1,11 @@
 import { genChannel } from '../channel';
-import {
-  BrowserWindowConstructorOptions
-} from "electron";
+import { IPluginFeature } from '../index'
 
 export function regShortcut(key: string, func: Function) {
     const channel = genChannel()
 
     const res = channel.sendSync('shortcon:reg', { key })
-    if ( res instanceof  String ) throw new Error(res)
+    if ( res instanceof String ) throw new Error(String(res))
     if ( res === false ) return false;
 
     channel.regChannel('shortcon:trigger', ({ data }) => key === data.key && func())
@@ -15,4 +13,16 @@ export function regShortcut(key: string, func: Function) {
     return true;
 }
 
+export function regFeature(feature: IPluginFeature): boolean {
+  const channel = genChannel()
+
+  return channel.sendSync('feature:reg', { feature })
+}
+
+export function unRegFeature(id: string): boolean {
+  const channel = genChannel()
+
+  return channel.sendSync('feature:unreg', { feature: id })
+}
+
 export * from './window';

package/plugin/sdk/window/index.ts

@@ -17,7 +17,7 @@ export function toggleWinVisible(id: number, visible?: boolean): boolean {
   return res.visible
 }
 
-export function setWindowProperty<K extends keyof BrowserWindow, V>(id: number, property: {
+export function setWindowProperty(id: number, property: {
 
 }): boolean {
   const res = genChannel().sendSync('window:property', { id, property })