@scriptdb/server 1.0.0 → 1.0.1

package/dist/index.js

@@ -4357,9 +4357,10 @@ import fs3 from "node:fs";
 import { spawn } from "node:child_process";
 import Storage from "@scriptdb/storage";
 var pkgData = `{
-  "name": "plugins",
+  "name": "scriptdb-workspace",
   "version": "1.0.0",
-  "description": "",
+  "description": "ScriptDB workspace for custom scripts, services, and databases",
+  "private": true,
   "devDependencies": {
     "@types/bun": "^1.3.2",
     "@types/node": "^20.0.0",
@@ -4416,10 +4417,10 @@ var configDefault = {
   logLevel: "info",
   DB_USERNAME: "admin",
   DB_PASSWORD: "password",
-  GITHUB_USERNAME: "scriptdb",
-  GITHUB_EMAIL: "scriptdb@example.com",
-  GITHUB_URL: "https://github.com/org-name/repo-name.git",
-  GITHUB_TOKEN: "ghp_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+  GITHUB_USERNAME: "",
+  GITHUB_EMAIL: "",
+  GITHUB_URL: "",
+  GITHUB_TOKEN: "",
   GITHUB_BRANCH: "main",
   users: [
     {
@@ -4469,16 +4470,23 @@ async function setupStorage(scriptdbDir) {
     const config = JSON.parse(configStr);
     await storage.initialize(scriptdbDir);
     console.log("Storage initialized");
-    const gitConfig = {
-      userName: config.GITHUB_USERNAME || "scriptdb",
-      userEmail: config.GITHUB_EMAIL || "scriptdb@example.com"
-    };
-    await storage.setConfig(gitConfig);
-    console.log("Git config set");
+    if (config.GITHUB_USERNAME && config.GITHUB_EMAIL) {
+      const gitConfig = {
+        userName: config.GITHUB_USERNAME,
+        userEmail: config.GITHUB_EMAIL
+      };
+      await storage.setConfig(gitConfig);
+      console.log("Git config set");
+    } else {
+      console.log("Git config not set (configure later with 'scriptdb config')");
+    }
     if (config.GITHUB_URL && isGitUrl(config.GITHUB_URL)) {
       const remoteUrl = injectGitToken(config.GITHUB_URL, config.GITHUB_TOKEN);
       await storage.addRemote("origin", config.GITHUB_TOKEN ? remoteUrl : config.GITHUB_URL);
       await storage.pull("origin", config.GITHUB_BRANCH || "main");
+      console.log("Remote repository configured");
+    } else {
+      console.log("Remote repository not configured (configure later with 'scriptdb config')");
     }
     console.log("Storage setup complete");
   } catch (err) {
@@ -4488,12 +4496,13 @@ async function setupStorage(scriptdbDir) {
 async function setupDir() {
   const scriptdbDir = path2.join(getHomeDir(), ".scriptdb");
   const databasesDir = path2.join(scriptdbDir, "databases");
-  const pluginsDir = path2.join(scriptdbDir, "plugins");
   const servicesDir = path2.join(scriptdbDir, "services");
   const clientsDir = path2.join(scriptdbDir, "clients");
   const configFile = path2.join(scriptdbDir, "config.json");
   const gitignoreFile = path2.join(scriptdbDir, ".gitignore");
-  const isFullySetup = fs3.existsSync(scriptdbDir) && fs3.existsSync(databasesDir) && fs3.existsSync(pluginsDir) && fs3.existsSync(servicesDir) && fs3.existsSync(clientsDir) && fs3.existsSync(configFile) && fs3.existsSync(gitignoreFile) && fs3.existsSync(path2.join(pluginsDir, "package.json")) && fs3.existsSync(path2.join(pluginsDir, "tsconfig.json")) && fs3.existsSync(path2.join(pluginsDir, "index.ts"));
+  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);
   if (isFullySetup) {
     console.log("ScriptDB directory already fully configured:", scriptdbDir);
     return;
@@ -4504,21 +4513,14 @@ async function setupDir() {
     fs3.mkdirSync(databasesDir, { recursive: true });
     fs3.mkdirSync(servicesDir, { recursive: true });
     fs3.mkdirSync(clientsDir, { recursive: true });
-    fs3.mkdirSync(pluginsDir, { recursive: true });
-    fs3.writeFileSync(configFile, JSON.stringify(configDefault), "utf8");
+    fs3.writeFileSync(configFile, JSON.stringify(configDefault, null, 2), "utf8");
     fs3.writeFileSync(gitignoreFile, dotGitignoreData, "utf8");
-    fs3.writeFileSync(path2.join(scriptdbDir, "package.json"), pkgData, "utf8");
-    fs3.writeFileSync(path2.join(scriptdbDir, "tsconfig.json"), tsconfigData, "utf8");
+    fs3.writeFileSync(packageJsonFile, pkgData, "utf8");
+    fs3.writeFileSync(tsconfigFile, tsconfigData, "utf8");
     console.log("Created:", scriptdbDir);
     await installPackage(scriptdbDir);
     await setupStorage(scriptdbDir);
   } else {
-    if (!fs3.existsSync(configFile)) {
-      fs3.writeFileSync(configFile, JSON.stringify(configDefault), "utf8");
-    }
-    if (!fs3.existsSync(gitignoreFile)) {
-      fs3.writeFileSync(gitignoreFile, dotGitignoreData, "utf8");
-    }
     if (!fs3.existsSync(databasesDir)) {
       fs3.mkdirSync(databasesDir, { recursive: true });
     }
@@ -4528,21 +4530,20 @@ async function setupDir() {
     if (!fs3.existsSync(clientsDir)) {
       fs3.mkdirSync(clientsDir, { recursive: true });
     }
-    if (!fs3.existsSync(pluginsDir)) {
-      fs3.mkdirSync(pluginsDir, { recursive: true });
-      fs3.writeFileSync(path2.join(scriptdbDir, "package.json"), pkgData, "utf8");
-      fs3.writeFileSync(path2.join(scriptdbDir, "tsconfig.json"), tsconfigData, "utf8");
+    if (!fs3.existsSync(configFile)) {
+      fs3.writeFileSync(configFile, JSON.stringify(configDefault, null, 2), "utf8");
+    }
+    if (!fs3.existsSync(gitignoreFile)) {
+      fs3.writeFileSync(gitignoreFile, dotGitignoreData, "utf8");
+    }
+    if (!fs3.existsSync(packageJsonFile)) {
+      fs3.writeFileSync(packageJsonFile, pkgData, "utf8");
+    }
+    if (!fs3.existsSync(tsconfigFile)) {
+      fs3.writeFileSync(tsconfigFile, tsconfigData, "utf8");
+    }
+    if (!fs3.existsSync(path2.join(scriptdbDir, "node_modules"))) {
       await installPackage(scriptdbDir);
-    } else {
-      if (!fs3.existsSync(path2.join(scriptdbDir, "package.json"))) {
-        fs3.writeFileSync(path2.join(scriptdbDir, "package.json"), pkgData, "utf8");
-      }
-      if (!fs3.existsSync(path2.join(scriptdbDir, "tsconfig.json"))) {
-        fs3.writeFileSync(path2.join(scriptdbDir, "tsconfig.json"), tsconfigData, "utf8");
-      }
-      if (!fs3.existsSync(path2.join(scriptdbDir, "node_modules"))) {
-        await installPackage(scriptdbDir);
-      }
     }
     console.log("Setup complete");
     await setupStorage(scriptdbDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scriptdb/server",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "server module resolver for script database",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -16,7 +16,7 @@
     "dist"
   ],
   "scripts": {
-    "dev": "bun --watch src/index.ts --watch ../dmr/src --watch ../pmr/src --watch ../vm/src --watch ../storage/src --watch ../system-modules/src",
+    "dev": "bun --watch src/index.ts --watch ../vm/src --watch ../storage/src --watch ../system-modules/src",
     "build": "bun build src/index.ts --outdir dist --target node --format esm --splitting --external '@scriptdb/*' --external bcryptjs --external bottleneck --external jsonwebtoken --external lru-cache",
     "build:cjs": "bun build src/index.ts --outdir dist --target node --format cjs --outfile dist/index.js --external '@scriptdb/*' --external bcryptjs --external bottleneck --external jsonwebtoken --external lru-cache",
     "build:types": "tsc --emitDeclarationOnly",
@@ -41,18 +41,15 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@scriptdb/client": "^1.0.0",
-    "@scriptdb/dmr": "^1.0.0",
-    "@scriptdb/pmr": "^1.0.0",
-    "@scriptdb/storage": "^1.0.0",
-    "@scriptdb/system-modules": "^1.0.0",
-    "@scriptdb/vm": "^1.0.0",
+    "@scriptdb/client": "^1.0.1",
+    "@scriptdb/storage": "^1.0.1",
+    "@scriptdb/system-modules": "^1.0.1",
+    "@scriptdb/vm": "^1.0.1",
     "@types/ws": "^8.18.1",
     "bcryptjs": "^3.0.3",
     "bottleneck": "^2.19.5",
     "jsonwebtoken": "^9.0.2",
     "lru-cache": "^11.2.2",
-    "node": "^25.2.0",
     "ws": "^8.18.3"
   }
 }