sks-maximo-utils 1.1.4 → 1.1.7

package/cli.js

@@ -13,10 +13,12 @@ const args = process.argv.slice(2);
 
 // 解析全局选项（--env）
 let globalEnv = 'local';
+let envSpecified = false;
 const filteredArgs = [];
 for (let i = 0; i < args.length; i++) {
   if (args[i] === '--env' || args[i] === '-e') {
     globalEnv = args[i + 1];
+    envSpecified = true;
     i++; // 跳过值
   } else {
     filteredArgs.push(args[i]);
@@ -24,7 +26,15 @@ for (let i = 0; i < args.length; i++) {
 }
 
 const cmd = filteredArgs[0];
-const env = filteredArgs[0];
+
+// 兼容位置参数写法：sks-maximo import-xxx <fileName> <env>
+const importCommands = ['import-object', 'import-appinfo', 'import-presentation', 'import-script', 'import-domain', 'import-maxintobject'];
+if (!envSpecified && importCommands.includes(cmd)) {
+  const positionalEnv = filteredArgs[2];
+  if (positionalEnv && !positionalEnv.startsWith('-')) {
+    globalEnv = positionalEnv;
+  }
+}
 
 if (!cmd || ['-h', '--help', '-?', '--version', '-v'].includes(cmd)) {
   console.log(`sks-maximo v${packageJson.version}`);

package/nodeutils/config.js

@@ -1,8 +1,8 @@
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import logger from './logger.js';
+import fs from "fs";
+import os from "os";
+import path from "path";
+import { fileURLToPath } from "url";
+import logger from "./logger.js";
 
 // 获取当前模块目录
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -11,7 +11,7 @@ let globalConfig = null;
 
 function getConfigPath() {
   const homeDir = os.homedir();
-  return path.join(homeDir, '.sks', 'nodeutils', 'config.json');
+  return path.join(homeDir, ".sks", "nodeutils", "config.json");
 }
 
 export function getConfigDir() {
@@ -39,7 +39,7 @@ export function loadConfig(env = null) {
 
   if (!env) {
     const args = process.argv.slice(2);
-    env = args[0] || 'local';
+    env = args[0];
   }
 
   try {
@@ -53,16 +53,22 @@ export function loadConfig(env = null) {
       copySampleConfig(configPath);
     }
 
-    const configData = fs.readFileSync(configPath, 'utf-8');
+    const configData = fs.readFileSync(configPath, "utf-8");
     const allConfigs = JSON.parse(configData);
+    if (!env) {
+      env = allConfigs.defaultEnv;
+    }
+    if(!env){
+      throw new Error(`未找到环境 ${env} 的配置`);
+    }
 
     // 获取全局配置
-    const globalLogLevel = allConfigs.logLevel || 'INFO';
+    const globalLogLevel = allConfigs.logLevel || "INFO";
     // console.log("globalLogLevel:"+ globalLogLevel);
 
     // 获取环境配置
     const envs = allConfigs.envs || {};
-    const envConfig = envs[env] || envs.local || envs.dev;
+    const envConfig = envs[env] ;
 
     if (!envConfig) {
       throw new Error(`未找到环境 ${env} 的配置`);
@@ -73,21 +79,21 @@ export function loadConfig(env = null) {
 
     // 设置默认 authType
     if (!globalConfig.authType) {
-      globalConfig.authType = 'apiKey';
+      globalConfig.authType = "apiKey";
     }
 
     // logLevel 优先使用环境配置，否则使用全局配置
     const logLevel = envConfig.logLevel || globalLogLevel;
-    
+
     // langcode 优先使用环境配置，否则使用全局配置，默认 zh
-    const langcode = envConfig.langcode || allConfigs.langcode || 'zh';
+    const langcode = envConfig.langcode || allConfigs.langcode || "zh";
     globalConfig.langcode = langcode;
 
     // 规范化 baseUrl
     if (globalConfig.baseUrl) {
-      globalConfig.baseUrl = globalConfig.baseUrl.replace(/\\/g, '/');
-      if (!globalConfig.baseUrl.endsWith('/')) {
-        globalConfig.baseUrl += '/';
+      globalConfig.baseUrl = globalConfig.baseUrl.replace(/\\/g, "/");
+      if (!globalConfig.baseUrl.endsWith("/")) {
+        globalConfig.baseUrl += "/";
       }
     }
 
@@ -102,7 +108,7 @@ export function loadConfig(env = null) {
 }
 
 function copySampleConfig(configPath) {
-  const sampleConfigPath = path.join(__dirname, 'sample.config.json');
+  const sampleConfigPath = path.join(__dirname, "sample.config.json");
 
   const configDir = path.dirname(configPath);
   if (!fs.existsSync(configDir)) {
@@ -115,30 +121,35 @@ function copySampleConfig(configPath) {
   } else {
     // 如果 sample.config.json 不存在，创建默认配置
     const defaultConfig = {
-      "logLevel": "INFO",
-      "langcode": "zh",
-      "envs": {
-        "local": {
-          "baseUrl": "http://127.0.0.1:9080/maximo",
-          "langcode": "zh",
-          "apiKey": "your-api-key-here",
-          "maxauth": ""
+      logLevel: "INFO",
+      langcode: "zh",
+      defaultEnv: "local",
+      envs: {
+        local: {
+          baseUrl: "http://127.0.0.1:9080/maximo",
+          langcode: "zh",
+          apiKey: "your-api-key-here",
+          maxauth: "",
         },
-        "dev": {
-          "baseUrl": "https://mdev/maximo",
-          "langcode": "zh",
-          "apiKey": "your-api-key-here",
-          "maxauth": ""
+        dev: {
+          baseUrl: "https://mdev/maximo",
+          langcode: "zh",
+          apiKey: "your-api-key-here",
+          maxauth: "",
         },
-        "hd": {
-          "baseUrl": "http://xxxxx:9080/maximo",
-          "langcode": "zh",
-          "apiKey": "your-api-key-here",
-          "maxauth": ""
-        }
-      }
+        hd: {
+          baseUrl: "http://xxxxx:9080/maximo",
+          langcode: "zh",
+          apiKey: "your-api-key-here",
+          maxauth: "",
+        },
+      },
     };
-    fs.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2), 'utf-8');
+    fs.writeFileSync(
+      configPath,
+      JSON.stringify(defaultConfig, null, 2),
+      "utf-8",
+    );
     logger.info(`[Config] 已创建默认配置文件: ${configPath}`);
   }
 }
@@ -159,5 +170,5 @@ export default {
   getConfig,
   getWorkDir,
   getConfigDir,
-  checkAndCreateConfig
-};
+  checkAndCreateConfig,
+};

package/nodeutils/maximoTools.js

@@ -500,7 +500,10 @@ export async function importMaxScript({fileName, logname}) {
         
         var headers={};
         if (scriptExists && scriptHref) {
-            deployUrl = scriptHref;
+            // Maximo 的资源 ID 是标准 base64 且把填充位 = 替换为 -（如 ...Uw== → ...Uw--），
+            // 不能用 base64url（直接去掉填充会导致服务端找不到资源而返回 404）。
+            const scriptId = Buffer.from(autoscript).toString('base64').replace(/=+$/, m => '-'.repeat(m.length));
+            deployUrl = `api/os/MXSCRIPT/_${scriptId}`;
             deployMethod = 'POST';
             headers =  {
                 'Content-Type': 'application/merge-patch+json',

package/nodeutils/requestHttp.js

@@ -29,10 +29,10 @@ function limitLogOutput(data, maxLength = 200) {
 
 function joinUrl(base, path) {
   if(path!=null&&path!==''){
-    if(path.startsWith('http')){
+    logger.debug(`[HTTP Log] ------------  base: ${base}, path: ${path}`);
+    if(path.startsWith('http://')||path.startsWith('https://')){
       return path;
     }
-
   }
   return `${base.replace(/\/$/, '')}/${path.replace(/^\//, '')}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sks-maximo-utils",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "description": "Maximo helper tools for updating table structures and data",
   "type": "module",
   "main": "index.js",