@polytric/openws-sdkgen 0.0.17 → 0.0.19

package/dist/plans/dotnet.cjs

@@ -39,10 +39,12 @@ var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${_
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
 // src/plans/dotnet.ts
+var import_node_crypto = require("crypto");
 var import_node_path = __toESM(require("path"), 1);
 var import_node_url = require("url");
 var __dirname = import_node_path.default.dirname((0, import_node_url.fileURLToPath)(importMetaUrl));
 var TEMPLATE_DIR = import_node_path.default.join(__dirname, "../templates/dotnet");
+var UNITY_META_GUID_PREFIX = "openws-sdkgen/unity-meta/";
 function pascalCase(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
@@ -55,7 +57,12 @@ function createPlan(ctx) {
   if (!request) throw new Error("request is required");
   const assemblyName = `${pascalCase(ir.package.project)}.${pascalCase(ir.package.service)}.Sdk`;
   ir.assemblyName = assemblyName;
-  const plan = [
+  const plan = [];
+  const folderMetaOutputs = /* @__PURE__ */ new Set();
+  pushUnityAssetStep(
+    plan,
+    request.outputPath,
+    folderMetaOutputs,
     {
       name: "assembly definition",
       command: "render",
@@ -63,6 +70,12 @@ function createPlan(ctx) {
       template: import_node_path.default.join(TEMPLATE_DIR, "Service.asmdef.ejs"),
       output: import_node_path.default.join(request.outputPath, assemblyName, `${assemblyName}.asmdef`)
     },
+    "UnityAssemblyDefinition.meta.ejs"
+  );
+  pushUnityAssetStep(
+    plan,
+    request.outputPath,
+    folderMetaOutputs,
     {
       name: "user assembly reference",
       command: "render",
@@ -73,8 +86,9 @@ function createPlan(ctx) {
         `${assemblyName}.User`,
         `${assemblyName}.User.asmref`
       )
-    }
-  ];
+    },
+    "UnityAssemblyDefinitionReference.meta.ejs"
+  );
   for (const networkIr of ir.networks) {
     const networkNamespace = `${pascalCase(ir.package.project)}.${pascalCase(ir.package.service)}.${pascalCase(networkIr.name)}`;
     const networkClassName = `${pascalCase(networkIr.name)}Network`;
@@ -107,7 +121,7 @@ function createPlan(ctx) {
     }
     const allRoles = [...hostRoles, ...remoteRoles];
     const allModelImports = allRoles.map((role) => `${networkNamespace}.Models.${role.className}`);
-    plan.push({
+    pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
       name: `network ${networkIr.name}`,
       command: "render",
       getData: () => ({
@@ -144,7 +158,7 @@ function createPlan(ctx) {
     for (const hostRole of hostRoles) {
       const roleHandlers = networkIr.handlers.filter((h) => h.roleName === hostRole.roleName);
       const modelImports = [`${networkNamespace}.Models.${hostRole.className}`];
-      plan.push({
+      pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
         name: `host role ${hostRole.className}`,
         command: "render",
         getData: () => ({
@@ -157,7 +171,7 @@ function createPlan(ctx) {
         template: import_node_path.default.join(TEMPLATE_DIR, "HostRole.cs.ejs"),
         output: import_node_path.default.join(networkOutputPath, "Roles", `${hostRole.className}.cs`)
       });
-      plan.push({
+      pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
         name: `user host role ${hostRole.className}`,
         command: "render",
         getData: () => ({
@@ -174,7 +188,7 @@ function createPlan(ctx) {
     for (const remoteRole of remoteRoles) {
       const roleMessages = networkIr.messages.filter((m) => m.roleName === remoteRole.roleName);
       const modelImports = [`${networkNamespace}.Models.${remoteRole.className}`];
-      plan.push({
+      pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
         name: `remote role ${remoteRole.className}`,
         command: "render",
         getData: () => ({
@@ -189,7 +203,7 @@ function createPlan(ctx) {
     }
     for (const modelIr of networkIr.models) {
       if (modelIr.type !== "object") continue;
-      plan.push({
+      pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
         name: `model ${modelIr.className}`,
         command: "render",
         getData: () => modelIr,
@@ -208,6 +222,60 @@ function createPlan(ctx) {
     plan
   };
 }
+function pushUnityCSharpStep(plan, outputRoot, folderMetaOutputs, step) {
+  pushUnityAssetStep(plan, outputRoot, folderMetaOutputs, step, "UnityMonoScript.meta.ejs");
+}
+function pushUnityAssetStep(plan, outputRoot, folderMetaOutputs, step, metaTemplate) {
+  pushUnityFolderMetaSteps(plan, outputRoot, folderMetaOutputs, import_node_path.default.dirname(step.output));
+  plan.push(step);
+  plan.push({
+    name: `${step.name} meta`,
+    command: "render",
+    getData: () => ({
+      guid: unityMetaGuid(outputRoot, step.output)
+    }),
+    template: import_node_path.default.join(TEMPLATE_DIR, metaTemplate),
+    output: `${step.output}.meta`
+  });
+}
+function pushUnityFolderMetaSteps(plan, outputRoot, folderMetaOutputs, leafFolderPath) {
+  const folders = getGeneratedFolders(outputRoot, leafFolderPath);
+  for (const folderPath of folders) {
+    const metaOutput = `${folderPath}.meta`;
+    if (folderMetaOutputs.has(metaOutput)) continue;
+    folderMetaOutputs.add(metaOutput);
+    plan.push({
+      name: `folder ${normalizeRelativeAssetPath(outputRoot, folderPath)} meta`,
+      command: "render",
+      getData: () => ({
+        guid: unityMetaGuid(outputRoot, folderPath)
+      }),
+      template: import_node_path.default.join(TEMPLATE_DIR, "UnityFolder.meta.ejs"),
+      output: metaOutput
+    });
+  }
+}
+function getGeneratedFolders(outputRoot, leafFolderPath) {
+  const folders = [];
+  let folderPath = import_node_path.default.normalize(leafFolderPath);
+  while (isGeneratedPath(outputRoot, folderPath)) {
+    folders.push(folderPath);
+    const parentPath = import_node_path.default.dirname(folderPath);
+    if (parentPath === folderPath) break;
+    folderPath = parentPath;
+  }
+  return folders.reverse();
+}
+function isGeneratedPath(outputRoot, assetPath) {
+  const relativePath = import_node_path.default.relative(import_node_path.default.normalize(outputRoot), import_node_path.default.normalize(assetPath));
+  return relativePath !== "" && relativePath !== ".." && !relativePath.startsWith(`..${import_node_path.default.sep}`) && !import_node_path.default.isAbsolute(relativePath);
+}
+function unityMetaGuid(outputRoot, assetPath) {
+  return (0, import_node_crypto.createHash)("md5").update(`${UNITY_META_GUID_PREFIX}${normalizeRelativeAssetPath(outputRoot, assetPath)}`).digest("hex");
+}
+function normalizeRelativeAssetPath(outputRoot, assetPath) {
+  return import_node_path.default.relative(import_node_path.default.normalize(outputRoot), import_node_path.default.normalize(assetPath)).replaceAll(import_node_path.default.sep, "/").replaceAll("\\", "/");
+}
 function mapType(property) {
   switch (property.type) {
     case "string":

package/dist/plans/dotnet.js

@@ -1,8 +1,10 @@
 // src/plans/dotnet.ts
+import { createHash } from "crypto";
 import path from "path";
 import { fileURLToPath } from "url";
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var TEMPLATE_DIR = path.join(__dirname, "../templates/dotnet");
+var UNITY_META_GUID_PREFIX = "openws-sdkgen/unity-meta/";
 function pascalCase(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
@@ -15,7 +17,12 @@ function createPlan(ctx) {
   if (!request) throw new Error("request is required");
   const assemblyName = `${pascalCase(ir.package.project)}.${pascalCase(ir.package.service)}.Sdk`;
   ir.assemblyName = assemblyName;
-  const plan = [
+  const plan = [];
+  const folderMetaOutputs = /* @__PURE__ */ new Set();
+  pushUnityAssetStep(
+    plan,
+    request.outputPath,
+    folderMetaOutputs,
     {
       name: "assembly definition",
       command: "render",
@@ -23,6 +30,12 @@ function createPlan(ctx) {
       template: path.join(TEMPLATE_DIR, "Service.asmdef.ejs"),
       output: path.join(request.outputPath, assemblyName, `${assemblyName}.asmdef`)
     },
+    "UnityAssemblyDefinition.meta.ejs"
+  );
+  pushUnityAssetStep(
+    plan,
+    request.outputPath,
+    folderMetaOutputs,
     {
       name: "user assembly reference",
       command: "render",
@@ -33,8 +46,9 @@ function createPlan(ctx) {
         `${assemblyName}.User`,
         `${assemblyName}.User.asmref`
       )
-    }
-  ];
+    },
+    "UnityAssemblyDefinitionReference.meta.ejs"
+  );
   for (const networkIr of ir.networks) {
     const networkNamespace = `${pascalCase(ir.package.project)}.${pascalCase(ir.package.service)}.${pascalCase(networkIr.name)}`;
     const networkClassName = `${pascalCase(networkIr.name)}Network`;
@@ -67,7 +81,7 @@ function createPlan(ctx) {
     }
     const allRoles = [...hostRoles, ...remoteRoles];
     const allModelImports = allRoles.map((role) => `${networkNamespace}.Models.${role.className}`);
-    plan.push({
+    pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
       name: `network ${networkIr.name}`,
       command: "render",
       getData: () => ({
@@ -104,7 +118,7 @@ function createPlan(ctx) {
     for (const hostRole of hostRoles) {
       const roleHandlers = networkIr.handlers.filter((h) => h.roleName === hostRole.roleName);
       const modelImports = [`${networkNamespace}.Models.${hostRole.className}`];
-      plan.push({
+      pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
         name: `host role ${hostRole.className}`,
         command: "render",
         getData: () => ({
@@ -117,7 +131,7 @@ function createPlan(ctx) {
         template: path.join(TEMPLATE_DIR, "HostRole.cs.ejs"),
         output: path.join(networkOutputPath, "Roles", `${hostRole.className}.cs`)
       });
-      plan.push({
+      pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
         name: `user host role ${hostRole.className}`,
         command: "render",
         getData: () => ({
@@ -134,7 +148,7 @@ function createPlan(ctx) {
     for (const remoteRole of remoteRoles) {
       const roleMessages = networkIr.messages.filter((m) => m.roleName === remoteRole.roleName);
       const modelImports = [`${networkNamespace}.Models.${remoteRole.className}`];
-      plan.push({
+      pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
         name: `remote role ${remoteRole.className}`,
         command: "render",
         getData: () => ({
@@ -149,7 +163,7 @@ function createPlan(ctx) {
     }
     for (const modelIr of networkIr.models) {
       if (modelIr.type !== "object") continue;
-      plan.push({
+      pushUnityCSharpStep(plan, request.outputPath, folderMetaOutputs, {
         name: `model ${modelIr.className}`,
         command: "render",
         getData: () => modelIr,
@@ -168,6 +182,60 @@ function createPlan(ctx) {
     plan
   };
 }
+function pushUnityCSharpStep(plan, outputRoot, folderMetaOutputs, step) {
+  pushUnityAssetStep(plan, outputRoot, folderMetaOutputs, step, "UnityMonoScript.meta.ejs");
+}
+function pushUnityAssetStep(plan, outputRoot, folderMetaOutputs, step, metaTemplate) {
+  pushUnityFolderMetaSteps(plan, outputRoot, folderMetaOutputs, path.dirname(step.output));
+  plan.push(step);
+  plan.push({
+    name: `${step.name} meta`,
+    command: "render",
+    getData: () => ({
+      guid: unityMetaGuid(outputRoot, step.output)
+    }),
+    template: path.join(TEMPLATE_DIR, metaTemplate),
+    output: `${step.output}.meta`
+  });
+}
+function pushUnityFolderMetaSteps(plan, outputRoot, folderMetaOutputs, leafFolderPath) {
+  const folders = getGeneratedFolders(outputRoot, leafFolderPath);
+  for (const folderPath of folders) {
+    const metaOutput = `${folderPath}.meta`;
+    if (folderMetaOutputs.has(metaOutput)) continue;
+    folderMetaOutputs.add(metaOutput);
+    plan.push({
+      name: `folder ${normalizeRelativeAssetPath(outputRoot, folderPath)} meta`,
+      command: "render",
+      getData: () => ({
+        guid: unityMetaGuid(outputRoot, folderPath)
+      }),
+      template: path.join(TEMPLATE_DIR, "UnityFolder.meta.ejs"),
+      output: metaOutput
+    });
+  }
+}
+function getGeneratedFolders(outputRoot, leafFolderPath) {
+  const folders = [];
+  let folderPath = path.normalize(leafFolderPath);
+  while (isGeneratedPath(outputRoot, folderPath)) {
+    folders.push(folderPath);
+    const parentPath = path.dirname(folderPath);
+    if (parentPath === folderPath) break;
+    folderPath = parentPath;
+  }
+  return folders.reverse();
+}
+function isGeneratedPath(outputRoot, assetPath) {
+  const relativePath = path.relative(path.normalize(outputRoot), path.normalize(assetPath));
+  return relativePath !== "" && relativePath !== ".." && !relativePath.startsWith(`..${path.sep}`) && !path.isAbsolute(relativePath);
+}
+function unityMetaGuid(outputRoot, assetPath) {
+  return createHash("md5").update(`${UNITY_META_GUID_PREFIX}${normalizeRelativeAssetPath(outputRoot, assetPath)}`).digest("hex");
+}
+function normalizeRelativeAssetPath(outputRoot, assetPath) {
+  return path.relative(path.normalize(outputRoot), path.normalize(assetPath)).replaceAll(path.sep, "/").replaceAll("\\", "/");
+}
 function mapType(property) {
   switch (property.type) {
     case "string":

package/dist/templates/dotnet/UnityAssemblyDefinition.meta.ejs

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: <%= ctx.guid %>
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/dist/templates/dotnet/UnityAssemblyDefinitionReference.meta.ejs

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: <%= ctx.guid %>
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/dist/templates/dotnet/UnityFolder.meta.ejs

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: <%= ctx.guid %>
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/dist/templates/dotnet/UnityMonoScript.meta.ejs

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: <%= ctx.guid %>
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

package/dist/templates/typescript/src/sdk/role.ts.ejs

@@ -133,13 +133,13 @@ export class <%= ctx.className %> {
 <% } -%>
 <% for (const remoteRole of ctx.remoteRoles) { -%>
         this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onOpen(async (fromRole, peer) => {
-            await this.handleOpen(fromRole, peer as <%= ctx.className %>Peer)
+            await this.handleOpen(fromRole, peer as unknown as <%= ctx.className %>Peer)
         })
         this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onClose(async (fromRole, peer) => {
-            await this.handleClose(fromRole, peer as <%= ctx.className %>Peer)
+            await this.handleClose(fromRole, peer as unknown as <%= ctx.className %>Peer)
         })
         this.binder.fromRoles[<%- JSON.stringify(remoteRole.roleName) %>].onError(async (fromRole, peer, error) => {
-            await this.handleError(fromRole, peer as <%= ctx.className %>Peer, error)
+            await this.handleError(fromRole, peer as unknown as <%= ctx.className %>Peer, error)
         })
 <% } -%>
         if (canBindTransport(transport)) {
@@ -159,13 +159,21 @@ export class <%= ctx.className %> {
             case <%- JSON.stringify(remoteRole.roleName) %>: {
                 const remoteEndpoint = endpoint ?? (<%- remoteRole.endpoints.length > 0 ? JSON.stringify(remoteRole.endpoints[0]) : 'undefined' %> as OpenWsEndpoint | undefined)
                 await this.transport.connect?.(roleName, remoteEndpoint)
-                const session = this.runtime.newSession(this.sendEnvelope)
+                let connection: <%= ctx.className %>Connection | undefined
+                const session = this.runtime.newSession(this.sendEnvelope, async () => {
+                    if (!connection) {
+                        await session.close()
+                        return
+                    }
+                    await this.closeConnection(connection)
+                })
                 const <%= remoteRole.varName %>Peer = await session.open(<%- JSON.stringify(remoteRole.roleName) %>)
-                this.connections.add({
+                connection = {
                     roleName: <%- JSON.stringify(remoteRole.roleName) %>,
                     session,
                     peer: <%= remoteRole.varName %>Peer,
-                })
+                }
+                this.connections.add(connection)
                 this.<%= remoteRole.peerVarName %> = <%= remoteRole.varName %>Peer as unknown as <%= remoteRole.scopedPeerName %>
 <% for (const handler of ctx.handlers) { -%>
 <% const handlerDefaultPeer = handler.bindFromRoles.find(fromRole => ctx.remoteRoles.some(remoteRole => remoteRole.roleName === fromRole.roleName)) ?? ctx.remoteRoles[0] -%>
@@ -198,11 +206,11 @@ export class <%= ctx.className %> {
             await this.closeSessions(peer)
             return
         }
-        const connection = this.findConnectionByPeer(peer as PeerProto)
+        const connection = this.findConnectionByPeer(peer as unknown as PeerProto)
         if (!connection) {
             throw new Error('Peer is not connected')
         }
-        await this.closeConnection(connection)
+        await this.runtime.disconnect(connection.peer)
     }
 
     /**
@@ -518,13 +526,21 @@ export class <%= ctx.className %> {
             case <%- JSON.stringify(remoteRole.roleName) %>: {
                 const remoteEndpoint = endpoint ?? <%- remoteRole.endpoints.length > 0 ? JSON.stringify(remoteRole.endpoints[0]) : 'undefined' %>
                 await this.transport.connect?.(roleName, remoteEndpoint)
-                const session = this.runtime.newSession(this.sendEnvelope)
+                let connection
+                const session = this.runtime.newSession(this.sendEnvelope, async () => {
+                    if (!connection) {
+                        await session.close()
+                        return
+                    }
+                    await this.#closeConnection(connection)
+                })
                 this.<%= remoteRole.peerVarName %> = await session.open(<%- JSON.stringify(remoteRole.roleName) %>)
-                this.#connections.add({
+                connection = {
                     roleName: <%- JSON.stringify(remoteRole.roleName) %>,
                     session,
                     peer: this.<%= remoteRole.peerVarName %>,
-                })
+                }
+                this.#connections.add(connection)
 <% for (const handler of ctx.handlers) { -%>
 <% const handlerDefaultPeer = handler.bindFromRoles.find(fromRole => ctx.remoteRoles.some(remoteRole => remoteRole.roleName === fromRole.roleName)) ?? ctx.remoteRoles[0] -%>
 <% if (handlerDefaultPeer?.roleName === remoteRole.roleName) { -%>
@@ -556,7 +572,7 @@ export class <%= ctx.className %> {
         if (!connection) {
             throw new Error('Peer is not connected')
         }
-        await this.#closeConnection(connection)
+        await this.runtime.disconnect(connection.peer)
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polytric/openws-sdkgen",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "OpenWS SDK generator CLI",
   "type": "module",
   "bin": {
@@ -50,12 +50,12 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "ws": "^8.18.3",
-    "@polytric/openws": "^0.0.10"
+    "@polytric/openws": "^0.0.11"
   },
   "scripts": {
     "build": "tsup",
     "typecheck": "tsc --noEmit",
-    "test:csharp:unity": "node dist/main.cjs --spec ./test/spec.json --out ./generated/dotnet/unity --project Example --network core --hostRole client --language csharp --environment unity",
+    "test:csharp:unity": "node dist/main.cjs --spec ./test/spec.json --out ./generated/dotnet/unity --project Example --network core --hostRole client --language csharp --environment unity && node --test ./test/dotnet/unity-meta.test.mjs",
     "test:javascript:node": "node dist/main.cjs --spec ./test/spec.json --out ./generated/javascript/node --project Example --network core --hostRole client --language javascript --environment node",
     "test:typescript:node": "node dist/main.cjs --spec ./test/spec.json --out ./generated/typescript/node --project Example --network core --hostRole client --language typescript --environment node",
     "test:typescript:server": "tsx ./test/typescript/server.ts",