glyphix 1.0.14 → 1.0.16

package/bin/glyphix.js

@@ -138,6 +138,7 @@ var import_glob = require("glob");
 var import_chalk2 = __toESM(require("chalk"));
 var import_node_process = require("process");
 var import_dotenv = __toESM(require("dotenv"));
+var import_lodash = require("lodash");
 function loadEnv() {
   const dotenvTags = [
     // 本地环境
@@ -194,6 +195,7 @@ function lintFile(rootPath) {
     warnIgnored: true,
     overrideConfig: {
       rules: {
+        "no-console": "off",
         "prettier/prettier": "warn",
         "@typescript-eslint/ban-ts-comment": "warn",
         "@typescript-eslint/no-explicit-any": "warn",
@@ -229,14 +231,9 @@ function dealResource() {
     entry: entriedFullPath
   };
 }
-function build(rootPath, entriedFullPath) {
+function generateEsbuildConfig(rootPath, entriedFullPath, envDefine) {
   const resolveExtensions = [".ts", ".js"];
-  let envDefine = {};
-  Array.from(Object.keys(process.env)).forEach((key) => {
-    if (key.startsWith("GLYPHIX"))
-      envDefine[`process.env.${key}`] = JSON.stringify(process.env[key]);
-  });
-  import_esbuild.default.build({
+  const internalConfig = {
     entryPoints: entriedFullPath,
     // 入口文件
     bundle: true,
@@ -284,7 +281,24 @@ function build(rootPath, entriedFullPath) {
         }
       }
     ]
-  }).then(() => {
+  };
+  const customConfigPath = (0, import_node_path3.resolve)(process.cwd(), "glyphix.config.js");
+  if (!(0, import_node_fs.existsSync)(customConfigPath)) return internalConfig;
+  try {
+    const useConfig = require(customConfigPath);
+    return (0, import_lodash.merge)(internalConfig, useConfig);
+  } catch (error) {
+    console.error(error);
+  }
+  return internalConfig;
+}
+function build(rootPath, entriedFullPath) {
+  let envDefine = {};
+  Array.from(Object.keys(process.env)).forEach((key) => {
+    if (key.startsWith("GLYPHIX"))
+      envDefine[`process.env.${key}`] = JSON.stringify(process.env[key]);
+  });
+  import_esbuild.default.build(generateEsbuildConfig(rootPath, entriedFullPath, envDefine)).then(() => {
     console.log("Build completed!");
   }).catch((error) => {
     console.error("Build failed:", error);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "glyphix",
-	"version": "1.0.14",
+	"version": "1.0.16",
 	"main": "lib/index.js",
 	"types": "types/index.d.ts",
 	"files": [
@@ -10,9 +10,7 @@
 		"script/",
 		"libs/"
 	],
-	"scripts": {
-		"postinstall": "node ./script/install.js"
-	},
+	"scripts": {},
 	"bin": {
 		"glyphix": "./bin/glyphix.js"
 	},
@@ -34,6 +32,7 @@
 		"eslint": "^9.18.0",
 		"fs-extra": "^11.2.0",
 		"glob": "^11.0.1",
+		"lodash": "^4.17.21",
 		"yargs": "^17.7.2"
 	}
 }

package/types/brightness.d.ts

@@ -0,0 +1,9 @@
+declare module "@system.brightness" {
+    interface BrightnessFactory {
+        setKeepScreenOn(status: boolean): void;
+    }
+  
+    const brightnessFactory: BrightnessFactory;
+    export default brightnessFactory;
+  }
+  

package/types/device.d.ts

@@ -1,34 +1,53 @@
 declare module "@system.device" {
+
+    type IdType = 'device' | 'mac' | 'user' | 'advertising'
     interface DeviceFactory {
-        getInfo
-            (): Promise<{
-                brand: string,
-                manufacturer: string,
-                model: string,
-                product: string,
-                osType: string,
-                osVersionName: string
-            }>,
-        getId
-            (types: ('device' | 'mac' | 'user' | 'advertising')[])
-            : Promise<{
-                device?: string,
-                mac?: string,
-                user?: string,
-                advertising?: string
-            }>,
-        getDeviceId
-            (): Promise<{ deviceId: string }>,
-        getSerial
-            (): Promise<{ serial: string }>,
-        getTotalStorage
-            (): Promise<{ totalStorage: number }>,
-        getAvailableStorage
-            (): Promise<{ availableStorage: number }>,
-        screenWidth: number,
-        screenHeight: number,
-        screenDensity: number,
-        screenShape: 'rect' | 'circle',
+        getInfo(): Promise<{
+            brand: string,
+            manufacturer: string,
+            model: string,
+            product: string,
+            osType: string,
+            osVersionName: string
+        }>
+
+        getId<T extends IdType[]>({type: T}): Promise<{[K in T[number]]: string}>
+        getDeviceId(): Promise<{ deviceId: string }>
+
+        // 获取设备唯一标识。
+        getDeviceId(): Promise<{ deviceId: string }>
+
+        // 获取设备序列号。
+        getSerial(): Promise<{ serial: string }>
+
+        // 获取存储空间的总大小。
+        getTotalStorage(): Promise<{ totalStorage: number }>
+
+        // 获取存储空间的可用大小。
+        getAvailableStorage(): Promise<{ availableStorage: number }>
+
+        // 设备的屏幕宽度，单位为像素。
+        screenWidth: number
+
+
+        // 设备的屏幕高度，单位为像素。
+        // 
+        screenHeight: number
+
+        //设备的屏幕像素密度，单位为 PPI。
+        screenDensity: number
+
+        /**
+         * //设备的屏幕形状，值的含义如下：
+        'rect': 设备具有矩形屏幕。
+        'circle': 设备具有圆形屏幕。
+         */
+
+        screenShape: 'rect' | 'circle'
+        /**
+         * 获取设备的内存配置文件属性。这个属性是 memory-profile 媒体查询属性的 JavaScript API 版本，具体请参考媒体查询属性的文档。
+         * 与 memory-profile 媒体查询属性不同，memoryProfile 属性的值是一个整数，单位固定为 KiB
+         */
         memoryProfile: number
     }
 

package/types/fetch.d.ts

@@ -6,7 +6,7 @@ declare module "@system.fetch" {
       header?: { [key: string]: string };
       params?: { [key: string]: string | number };
       data?: string | ArrayBuffer | { [key: string]: any };
-      responseType?: "text" | "json" | "arraybuffer";
+      responseType?: "text" | "json" | "arraybuffer" | 'formdata';
       timeout?: number;
     }): Promise<{
       code: number;

package/types/index.d.ts

@@ -8,7 +8,10 @@
 /// <reference path="./file.d.ts" />
 /// <reference path="./network.d.ts" />
 /// <reference path="./cipher.d.ts" />
+/// <reference path="./invoke.d.ts" />
+/// <reference path="./prompt.d.ts" />
 /// <reference path="./device.d.ts" />
+/// <reference path="./brightness.d.ts" />
 
 
 type ComputedResults<C, D> = {

package/types/websocketfactory.d.ts

@@ -11,7 +11,7 @@ declare module "@system.websocketfactory" {
     close(params: { code: number; reason: string }): void;
 
     onopen?: () => void;
-    onmessage?: (msg: string | ArrayBuffer) => void;
+    onmessage?: (data: {data: string | ArrayBuffer}) => void;
     onclose?: (event: { code: number; reason: string }) => void;
     onerror?: (error: { code: number; reason: string }) => void;
   }