@yydb/yyds 0.0.17 → 0.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yydb/yyds",
-  "version": "0.0.17",
+  "version": "0.0.20",
   "description": "Node.js facade, CLI, and native bindings for local YYDS nodes.",
   "license": "MPL-2.0",
   "type": "module",
@@ -59,14 +59,14 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@yydb/yyds-win32-x64": "0.0.17",
-    "@yydb/yyds-linux-x64": "0.0.17",
-    "@yydb/yyds-darwin-x64": "0.0.17",
-    "@yydb/yyds-darwin-arm64": "0.0.17"
+    "@yydb/yyds-win32-x64": "0.0.20",
+    "@yydb/yyds-linux-x64": "0.0.20",
+    "@yydb/yyds-darwin-x64": "0.0.20",
+    "@yydb/yyds-darwin-arm64": "0.0.20"
   },
   "devDependencies": {
     "@types/node": "^22.15.0",
-    "@yydb/yyds-webui": "0.0.17",
+    "@yydb/yyds-webui": "0.0.20",
     "typescript": "^5.9.2"
   },
   "engines": {

package/src/bindings.ts

@@ -6,14 +6,30 @@ export interface YydsBindings {
     NodeLeaseHandle: {
         acquire(dataDir: string, identity: unknown): unknown;
     };
-    LocalExecutorHandle: new (dataDir: string) => unknown;
+    LocalExecutorHandle: new (dataDir: string, catalogPath?: string | null) => unknown;
     RedisServiceHandle: new (
         lease: unknown,
         port: number,
         executor: unknown,
     ) => RedisServiceBinding;
-    PgsqlServiceHandle: new (lease: unknown, port: number) => PgsqlServiceBinding;
-    MysqlServiceHandle: new (lease: unknown, port: number) => MysqlServiceBinding;
+    PgsqlServiceHandle: {
+        new (lease: unknown, port: number): PgsqlServiceBinding;
+        start_with_executor(
+            lease: unknown,
+            port: number,
+            executor: unknown,
+            catalogPath: string,
+        ): PgsqlServiceBinding;
+    };
+    MysqlServiceHandle: {
+        new (lease: unknown, port: number): MysqlServiceBinding;
+        start_with_executor(
+            lease: unknown,
+            port: number,
+            executor: unknown,
+            catalogPath: string,
+        ): MysqlServiceBinding;
+    };
     MongoServiceHandle: new (
         lease: unknown,
         port: number,

package/src/node/runtime.ts

@@ -9,6 +9,7 @@ export interface StartNodeOptions {
     dataDir: string;
     clusterId: string;
     nodeId: string;
+    catalogPath?: string;
     redisPort?: number;
     pgsqlPort?: number;
     mysqlPort?: number;
@@ -55,6 +56,10 @@ export function parseStartOptions(protocol: YydsProtocol, args: string[]): Start
             options.nodeId = args[++index] ?? "";
             continue;
         }
+        if (argument === "--catalog-path") {
+            options.catalogPath = args[++index] ?? "";
+            continue;
+        }
         if (argument === "--redis-port") {
             options.redisPort = Number(args[++index]);
             continue;
@@ -81,6 +86,10 @@ export function parseStartOptions(protocol: YydsProtocol, args: string[]): Start
     if (!options.dataDir || !options.clusterId || !options.nodeId) {
         throw new Error("start requires --data-dir, --cluster-id, and --node-id");
     }
+    if (options.catalogPath !== undefined && options.catalogPath.length === 0) {
+        // 空字符串视为未提供；避免将空值传给 Rust。
+        options.catalogPath = undefined;
+    }
     const defaultPort = defaultPorts[protocol];
     if (protocol === "mysql" && options.mysqlPort === undefined && defaultPort !== undefined) {
         options.mysqlPort = defaultPort;
@@ -88,6 +97,7 @@ export function parseStartOptions(protocol: YydsProtocol, args: string[]): Start
     if (protocol === "postgresql" && options.pgsqlPort === undefined && defaultPort !== undefined) {
         options.pgsqlPort = defaultPort;
     }
+    void portFlags; // 变量声明用于协议完整性校验，运行时不再读取
     return options;
 }
 
@@ -96,20 +106,37 @@ export async function runNodeStart(options: StartNodeOptions): Promise<void> {
     const native = loadYydsNative();
     const identity = new native.NodeIdentityHandle(options.clusterId, options.nodeId);
     const lease = native.NodeLeaseHandle.acquire(options.dataDir, identity);
-    const executor = new native.LocalExecutorHandle(options.dataDir);
+    const executor = new native.LocalExecutorHandle(options.dataDir, options.catalogPath);
     const redis = new native.RedisServiceHandle(
         lease,
         options.redisPort ?? DEFAULT_REDIS_PORT,
         executor,
     );
+
+    // SQL runtimes 仅在提供了 catalog 时启动完整执行路径；否则保持协议壳。
+    const hasRuntime = options.catalogPath !== undefined;
     const pgsql =
         options.pgsqlPort === undefined
             ? undefined
-            : new native.PgsqlServiceHandle(lease, options.pgsqlPort);
+            : hasRuntime
+                ? native.PgsqlServiceHandle.start_with_executor(
+                      lease,
+                      options.pgsqlPort,
+                      executor,
+                      options.catalogPath!,
+                  )
+                : new native.PgsqlServiceHandle(lease, options.pgsqlPort);
     const mysql =
         options.mysqlPort === undefined
             ? undefined
-            : new native.MysqlServiceHandle(lease, options.mysqlPort);
+            : hasRuntime
+                ? native.MysqlServiceHandle.start_with_executor(
+                      lease,
+                      options.mysqlPort,
+                      executor,
+                      options.catalogPath!,
+                  )
+                : new native.MysqlServiceHandle(lease, options.mysqlPort);
     const mongo =
         options.mongoPort === undefined
             ? undefined
@@ -131,8 +158,9 @@ export async function runNodeStart(options: StartNodeOptions): Promise<void> {
     };
     native.nodeWriteRuntimeStatus(options.dataDir, JSON.stringify(runtime));
 
+    const runtimeTag = hasRuntime ? "sql-runtime" : "protocol-only";
     process.stdout.write(
-        `yyds running pid=${runtime.pid} redis=${runtime.redisAddress} pgsql=${runtime.pgsqlAddress ?? "null"} mysql=${runtime.mysqlAddress ?? "null"} mongo=${mongo?.address() ?? "null"} wire=${runtime.wireAddress ?? "null"}\n`,
+        `yyds running pid=${runtime.pid} mode=${runtimeTag} redis=${runtime.redisAddress} pgsql=${runtime.pgsqlAddress ?? "null"} mysql=${runtime.mysqlAddress ?? "null"} mongo=${mongo?.address() ?? "null"} wire=${runtime.wireAddress ?? "null"}\n`,
     );
 
     while (true) {