@scriptdb/server 1.0.6 → 1.0.8

package/dist/index.js

@@ -2890,8 +2890,6 @@ try {
   if (fs2.existsSync(configPath)) {
     const configContent = fs2.readFileSync(configPath, "utf8");
     fileConfig = JSON.parse(configContent);
-    console.log("Loaded config from:", configPath);
-    console.log("Config users:", fileConfig.users);
   } else {
     console.log("No config file found at:", configPath, "- using defaults");
   }
@@ -4358,7 +4356,7 @@ import { spawn } from "node:child_process";
 import Storage from "@scriptdb/storage";
 var pkgData = `{
   "name": "scriptdb-workspace",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "ScriptDB workspace for custom scripts, services, and databases",
   "private": true,
   "devDependencies": {
@@ -4404,6 +4402,32 @@ var tsconfigData = `
 var dotGitignoreData = `
 # Ignore all files in this directory
 node_modules/
+bin/
+`;
+var ecosystemData = `
+module.exports = {
+  apps: [{
+    name: 'scriptdb',
+    script: process.platform === 'win32'
+      ? require('path').join(require('os').homedir(), '.scriptdb', 'bin', 'scriptdb.exe')
+      : 'scriptdb',
+    args: 'start --force',
+    cwd: require('path').join(require('os').homedir(), '.scriptdb'),
+    instances: 1,
+    autorestart: true,
+    watch: false,
+    max_memory_restart: '1G',
+    env: {
+      NODE_ENV: 'production'
+    },
+    error_file: require('path').join(require('os').homedir(), '.scriptdb', 'pm2-error.log'),
+    out_file: require('path').join(require('os').homedir(), '.scriptdb', 'pm2-out.log'),
+    log_file: require('path').join(require('os').homedir(), '.scriptdb', 'pm2-combined.log'),
+    time: true,
+    log_date_format: 'YYYY-MM-DD HH:mm:ss Z',
+    merge_logs: true
+  }]
+};
 `;
 var configDefault = {
   PORT: 3800,
@@ -4495,11 +4519,13 @@ async function setupDir() {
   const databasesDir = path2.join(scriptdbDir, "databases");
   const servicesDir = path2.join(scriptdbDir, "services");
   const clientsDir = path2.join(scriptdbDir, "clients");
+  const binDir = path2.join(scriptdbDir, "bin");
   const configFile = path2.join(scriptdbDir, "config.json");
   const gitignoreFile = path2.join(scriptdbDir, ".gitignore");
   const packageJsonFile = path2.join(scriptdbDir, "package.json");
   const tsconfigFile = path2.join(scriptdbDir, "tsconfig.json");
-  const isFullySetup = fs3.existsSync(scriptdbDir) && fs3.existsSync(databasesDir) && fs3.existsSync(servicesDir) && fs3.existsSync(clientsDir) && fs3.existsSync(configFile) && fs3.existsSync(gitignoreFile) && fs3.existsSync(packageJsonFile) && fs3.existsSync(tsconfigFile);
+  const ecosystemFile = path2.join(scriptdbDir, "ecosystem.config.js");
+  const isFullySetup = fs3.existsSync(scriptdbDir) && fs3.existsSync(databasesDir) && fs3.existsSync(servicesDir) && fs3.existsSync(clientsDir) && fs3.existsSync(binDir) && fs3.existsSync(configFile) && fs3.existsSync(gitignoreFile) && fs3.existsSync(packageJsonFile) && fs3.existsSync(tsconfigFile) && fs3.existsSync(ecosystemFile);
   if (isFullySetup) {
     console.log("ScriptDB directory already fully configured:", scriptdbDir);
     return;
@@ -4510,10 +4536,12 @@ async function setupDir() {
     fs3.mkdirSync(databasesDir, { recursive: true });
     fs3.mkdirSync(servicesDir, { recursive: true });
     fs3.mkdirSync(clientsDir, { recursive: true });
+    fs3.mkdirSync(binDir, { recursive: true });
     fs3.writeFileSync(configFile, JSON.stringify(configDefault, null, 2), "utf8");
     fs3.writeFileSync(gitignoreFile, dotGitignoreData, "utf8");
     fs3.writeFileSync(packageJsonFile, pkgData, "utf8");
     fs3.writeFileSync(tsconfigFile, tsconfigData, "utf8");
+    fs3.writeFileSync(ecosystemFile, ecosystemData, "utf8");
     console.log("Created:", scriptdbDir);
     await installPackage(scriptdbDir);
     await setupStorage(scriptdbDir);
@@ -4527,6 +4555,9 @@ async function setupDir() {
     if (!fs3.existsSync(clientsDir)) {
       fs3.mkdirSync(clientsDir, { recursive: true });
     }
+    if (!fs3.existsSync(binDir)) {
+      fs3.mkdirSync(binDir, { recursive: true });
+    }
     if (!fs3.existsSync(configFile)) {
       fs3.writeFileSync(configFile, JSON.stringify(configDefault, null, 2), "utf8");
     }
@@ -4539,6 +4570,9 @@ async function setupDir() {
     if (!fs3.existsSync(tsconfigFile)) {
       fs3.writeFileSync(tsconfigFile, tsconfigData, "utf8");
     }
+    if (!fs3.existsSync(ecosystemFile)) {
+      fs3.writeFileSync(ecosystemFile, ecosystemData, "utf8");
+    }
     if (!fs3.existsSync(path2.join(scriptdbDir, "node_modules"))) {
       await installPackage(scriptdbDir);
     }
@@ -4672,7 +4706,7 @@ class ScriptDBClient {
       parsed.password = "";
       this.uri = parsed.toString();
     } catch (e) {
-      this.uri = normalized;
+      this.uri = uri;
     }
     this.host = parsed.hostname || "localhost";
     this.port = parsed.port ? parseInt(parsed.port, 10) : 1234;
@@ -4763,6 +4797,12 @@ class ScriptDBClient {
         this._connecting = null;
         return reject(error);
       }
+      if (!this.client) {
+        const error = new Error("Failed to create client socket");
+        this.logger?.error?.("Connection failed", error.message);
+        this._connecting = null;
+        return reject(error);
+      }
       const onError = (err) => {
         this.logger?.error?.("Client socket error:", err && err.message ? err.message : err);
         this._handleDisconnect(err);
@@ -4773,7 +4813,7 @@ class ScriptDBClient {
       };
       this.client.on("error", onError);
       this.client.on("close", onClose);
-      if (this.socketTimeout > 0) {
+      if (this.socketTimeout > 0 && this.client) {
         this.client.setTimeout(this.socketTimeout);
         this.client.on("timeout", () => {
           this.logger?.warn?.("Socket timeout, destroying connection");
@@ -5630,8 +5670,23 @@ async function server() {
           allowed.host = parsedConfig.host;
         if (parsedConfig.port !== undefined)
           allowed.port = parsedConfig.port;
-        if (parsedConfig.users !== undefined)
-          allowed.users = parsedConfig.users;
+        if (parsedConfig.users !== undefined) {
+          if (Array.isArray(parsedConfig.users)) {
+            if (parsedConfig.users.length === 0) {
+              allowed.users = [];
+            } else if (typeof parsedConfig.users[0] === "string") {
+              allowed.users = parsedConfig.users.map((username) => ({
+                username,
+                password: "",
+                hash: false
+              }));
+            } else {
+              allowed.users = parsedConfig.users;
+            }
+          } else {
+            allowed.users = [parsedConfig.users];
+          }
+        }
         if (typeof parsedConfig.folder === "string")
           allowed.folder = parsedConfig.folder;
         if (typeof parsedConfig.secure === "boolean")
@@ -5698,7 +5753,7 @@ async function server() {
   } catch (err) {
     exitWithError("Failed to initialize VM", err);
   }
-  let storage;
+  let storage = null;
   try {
     storage = new Storage2(baseDir, basePath);
     await storage.initialize();
@@ -5706,6 +5761,9 @@ async function server() {
   } catch (err) {
     exitWithError("Failed to initialize Storage", err);
   }
+  if (!storage) {
+    exitWithError("Storage was not initialized");
+  }
   let scriptDBServer;
   try {
     scriptDBServer = new Protocal({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scriptdb/server",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "server module resolver for script database",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -41,10 +41,10 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@scriptdb/client": "^1.0.6",
-    "@scriptdb/storage": "^1.0.6",
-    "@scriptdb/system-modules": "^1.0.6",
-    "@scriptdb/vm": "^1.0.6",
+    "@scriptdb/client": "^1.0.8",
+    "@scriptdb/storage": "^1.0.8",
+    "@scriptdb/system-modules": "^1.0.8",
+    "@scriptdb/vm": "^1.0.8",
     "@types/ws": "^8.18.1",
     "bcryptjs": "^3.0.3",
     "bottleneck": "^2.19.5",