output files to dir

modules/mod/build.gradle.kts

@@ -25,7 +25,7 @@ val tstlTask = tasks.register<NpmTask>("typescriptToLua") {
 
   npmCommand.set(listOf("run", "build"))
 
-  inputs.dir(node.nodeProjectDir.asFileTree)
+  inputs.dir(node.nodeProjectDir)
       .skipWhenEmpty()
       .withPropertyName("sourceFiles")
       .withPathSensitivity(PathSensitivity.RELATIVE)
@@ -35,8 +35,12 @@ val tstlTask = tasks.register<NpmTask>("typescriptToLua") {
   outputs.dir(outputDir)
       .withPropertyName("outputDir")
 
-
   ignoreExitValue.set(false)
+
+  doFirst("clean") {
+    delete(outputDir)
+  }
+
 }
 
 //val typescriptSrc =
@@ -63,7 +67,7 @@ val modPackageTask = tasks.register<Zip>("package") {
   from(
       layout.projectDirectory.dir("src/main/resources/mod-data"),
       rootProject.layout.projectDirectory.file("LICENSE"),
-      tstlTask.get().outputs.files.filter { it.extension == "lua" },
+      tstlTask,
   )
 
   into(rootProject.name)
@@ -87,13 +91,23 @@ val copyModToServerTask = tasks.register<Copy>("copyModToServer") {
   into(layout.projectDirectory.dir("src/test/resources/server/data/mods").asFile)
 }
 
+val serverStopTask = tasks.register<Exec>("dockerStop") {
+  group = "$projectId.factorioServer"
+
+  mustRunAfter(copyModToServerTask)
+
+  workingDir = layout.projectDirectory.dir("src/test/resources/server/").asFile
+  commandLine = parseSpaceSeparatedArgs("docker-compose stop")
+}
+
 val serverUpTask = tasks.register<Exec>("dockerUp") {
   group = "$projectId.factorioServer"
 
-  workingDir = layout.projectDirectory.dir("src/test/resources/server/").asFile
+  dependsOn(copyModToServerTask, serverStopTask)
-  commandLine = parseSpaceSeparatedArgs("docker-compose up")
-}
 
+  workingDir = layout.projectDirectory.dir("src/test/resources/server/").asFile
+  commandLine = parseSpaceSeparatedArgs("docker-compose up -d")
+}
 
 //val serverRestartTask = tasks.register<Exec>("dockerRestart") {
 //  group = "$projectId.factorioServer"
@@ -102,13 +116,6 @@ val serverUpTask = tasks.register<Exec>("dockerUp") {
 //  commandLine = parseSpaceSeparatedArgs("docker-compose restart")
 //}
 
-tasks.register<Exec>("dockerStop") {
-  group = "$projectId.factorioServer"
-
-  workingDir = layout.projectDirectory.dir("src/test/resources/server/").asFile
-  commandLine = parseSpaceSeparatedArgs("docker-compose stop")
-}
-
 val copyModToClientTask = tasks.register<Copy>("copyModToClient") {
   description = "Copy the mod to the Factorio client"
   group = "$projectId.factorioClient"

modules/mod/src/main/typescript/events.ts

@@ -1,3 +1,26 @@
+// import {Kafka, Producer} from "kafkajs";
+
+// const {Kafka} = require("kafkajs")
+// import {Kafka, Producer} from "kafkajs/types"
+// import {Data, Mods} from "typed-factorio/settings/types"
+// import { events } from "typed-factorio/generated"
+
+// declare const factorioData: Data
+// declare const factorioMods: Mods
+
+
+// const eventEnum = {
+//   thingType: Object.values(defines.events)
+// }
+
+const SERVER_ID : uint = 0
+
+function outputEvent(filename: string, event: table) {
+  let json : string = game.table_to_json(event)
+  // game.print(`Creating file ${filename}, content: ${json}`)
+  game.write_file(filename, json, false, SERVER_ID)
+}
+
 script.on_event(
     [defines.events.on_pre_build, defines.events.on_player_dropped_item],
     (e: OnPreBuildEvent | OnPlayerDroppedItemEvent) => {
@@ -5,21 +28,30 @@ script.on_event(
     }
 );
 
+script.on_event(
+    defines.events.on_player_joined_game,
+    (e: OnPlayerJoinedGameEvent) => {
+      let filename : string = `${e.name}/${e.tick}_${e.player_index}`
+      outputEvent(filename, e)
+    }
+)
+
+script.on_event(
+    defines.events.on_player_changed_position,
+    (e: OnPlayerJoinedGameEvent) => {
+      let filename : string = `${e.name}/${e.tick}_${e.player_index}`
+      outputEvent(filename, e)
+    }
+)
+
 script.on_event(
     defines.events.on_tick,
     (e: OnTickEvent) => {
       if (e.tick % 60 == 0) {
         let msg = "test mod tick: " + e.tick + "\n"
-        // game.print(msg)
+        game.write_file("tick.log", msg, true, SERVER_ID)
-        game.write_file("tick.log", msg, true)
+        let filename : string = `${e.name}/${e.tick}`
-
+        outputEvent(filename, e)
-
-        let groups = game.permissions.groups.map(val => {
-          return val.name + "\n" + serpent.block(val)
-        }).join("\n")
-
-        game.write_file("permissions.json", groups, false)
-        // game.write_file("permissions-groups.json", serpent.block(game.permissions.groups), false)
       }
     }
 );

modules/mod/src/main/typescript/package.json

@@ -6,25 +6,31 @@
     "build": "tstl",
     "dev": "tstl --watch"
   },
-  "devDependencies": {
+  "engines": {
+    "node": ">=10.13.0"
+  },
+  "devDependencies": {},
+  "dependencies": {
+    "lua-types": "^2.11.0",
+    "@types/node": "^12.0.8",
+    "typescript-to-lua": "1.0.1",
+    "typed-factorio": "0.7.3"
+  },
+  "peerDependencies": {},
+  "optionalDependencies": {},
+  "bundledDependencies": [],
+  "//": {
+    "typescript": "4.4.3",
+    "@types/node": "^13.7.7",
+    "kafkajs": "1.15.0",
+    "lua-types": "^2.11.0",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
     "webpack": "5.38.1",
     "webpack-cli": "4.7.1",
     "format-util": "1.0.5",
     "source-map-loader": "3.0.0",
     "css-loader": "5.2.6",
     "style-loader": "2.0.0"
-  },
-  "dependencies": {
-    "react": "17.0.2",
-    "typescript-to-lua": "1.0.1",
-    "typed-factorio": "0.7.1",
-    "lua-types": "2.11.0",
-    "typescript": "4.4.3"
-  },
-  "peerDependencies": {},
-  "optionalDependencies": {},
-  "bundledDependencies": [],
-  "//": {
-    "react-dom": "17.0.2"
   }
 }

modules/mod/src/main/typescript/tsconfig.json

@@ -1,17 +1,60 @@
 {
+  "$schema": "https://raw.githubusercontent.com/TypeScriptToLua/vscode-typescript-to-lua/master/tsconfig-schema.json",
   "compilerOptions": {
-    "target": "esnext",
+    "target": "es2019",
     "lib": [
-      "esnext"
+      "es2019"
     ],
+    "module": "commonjs",
     "moduleResolution": "node",
     "types": [
+      "typescript-to-lua/language-extensions",
+      "lua-types/5.2",
       "typed-factorio/runtime"
     ],
-    "strict": true
+    "explainFiles": true,
+    "forceConsistentCasingInFileNames": true,
+    "listEmittedFiles": true,
+    "listFiles": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "sourceMap": false,
+    "strict": true,
+    "strictFunctionTypes": true,
+    "strictNullChecks": true,
+    "traceResolution": true,
   },
   "tstl": {
-    "luaTarget": "JIT",
+    "luaTarget": "5.2",
-    "tstlVerbose": true
+    "tstlVerbose": true,
+    "noHeader": true,
+    "luaLibImport" : "require",
+  },
+  "//": {
+    "noResolve": true,
+    "newLine": "lf",
+    "exclude": [
+      "node_modules"
+    ],
+    "exactOptionalPropertyTypes": true,
+    "luaTarget": "5.2",
+  "skipLibCheck": true,
+    "skipDefaultLibCheck": true,
+    "types": [
+      "node",
+      "typed-factorio/runtime",
+      "lua-types/5.2"
+    ],
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "//": "lua-types/5.2",
+    "luaLibImport" : "inline",
+    "noImplicitSelf": true,
+
+    "sourceMapTraceback": true,
+
+    "luaBundle " : "bundle.lua",
+    "luaBundleEntry " : "bundleEntry.lua"
   }
 }

modules/mod/src/test/resources/server/docker-compose.yml

@@ -8,11 +8,11 @@ services:
     restart: "unless-stopped"
     ports:
       - "34197:34197/udp" # factorio
-      - "27715:27715/tcp" # rcon
+      - "27015:27015/tcp" # rcon
     volumes:
       - "./data:/factorio"
-    environment:
+#    environment:
-      RCON_PORT: 27715
+#      RCON_PORT: 27715
 #    environment:
 #      - PUID=1000
 #      - PGID=1000