Use Machine

api/lib/connection-pool.ts

@@ -7,7 +7,9 @@ import Modeler from '@openaddresses/batch-generic';
 import { Connection } from './schema.js';
 import { InferSelectModel } from 'drizzle-orm';
 import sleep from './sleep.js';
-import ConnectionConfig from './connection-config.js';
+import ConnectionConfig, {
+    MachineConnConfig
+}from './connection-config.js';
 
 export class ConnectionClient {
     config: ConnectionConfig;
@@ -68,8 +70,10 @@ export default class ConnectionPool extends Map<number | string, ConnectionClien
         return new Promise((resolve, reject) => {
             stream.on('data', async (conn: InferSelectModel<typeof Connection>) => {
                 if (conn.enabled && !this.config.local) {
-                    conns.push(this.add(conn));
+                    conns.push(this.add(new MachineConnConfig(conn)));
                 }
+            }).on('error', (err) => {
+                return reject(err);
             }).on('end', async () => {
                 try {
                     await Promise.all(conns);

api/schema/connection_sinks.json

@@ -11,15 +11,15 @@
         "updated": {
             "$ref": "./connection_sinks/updated.json"
         },
-        "name": {
-            "$ref": "./connection_sinks/name.json"
-        },
         "enabled": {
             "$ref": "./connection_sinks/enabled.json"
         },
         "connection": {
             "$ref": "./connection_sinks/connection.json"
         },
+        "name": {
+            "$ref": "./connection_sinks/name.json"
+        },
         "type": {
             "$ref": "./connection_sinks/type.json"
         },
@@ -34,9 +34,9 @@
         "id",
         "created",
         "updated",
-        "name",
         "enabled",
         "connection",
+        "name",
         "type",
         "body",
         "logging"

api/schema/connections/auth.json

@@ -1,5 +1,5 @@
 {
     "type": "object",
-    "description": "",
+    "description": "Authentication settings for the connection",
     "$comment": "json"
 }

api/schema/connections/created.json

@@ -1,6 +1,6 @@
 {
     "type": "string",
-    "description": "",
+    "description": "Creation TimeStamp",
     "$comment": "timestamptz",
     "format": "date-time"
 }

api/schema/connections/description.json

@@ -1,5 +1,5 @@
 {
     "type": "string",
-    "description": "",
+    "description": "Human readable description",
     "$comment": "text"
 }

api/schema/connections/enabled.json

@@ -1,5 +1,5 @@
 {
     "type": "boolean",
-    "description": "",
+    "description": "Is the connection passing CoT messages from layers",
     "$comment": "bool"
 }

api/schema/connections/id.json

@@ -1,5 +1,5 @@
 {
     "type": "number",
-    "description": "",
+    "description": "Unique Connection ID",
     "$comment": "int4"
 }

api/schema/connections/name.json

@@ -1,5 +1,5 @@
 {
     "type": "string",
-    "description": "",
+    "description": "Unique human readable name",
     "$comment": "text"
 }

api/schema/connections/updated.json

@@ -1,6 +1,6 @@
 {
     "type": "string",
-    "description": "",
+    "description": "Updated TimeStamp",
     "$comment": "timestamptz",
     "format": "date-time"
 }

api/schema/icons.json

@@ -2,39 +2,39 @@
     "type": "object",
     "additionalProperties": false,
     "properties": {
-        "id": {
-            "$ref": "./icons/id.json"
-        },
-        "created": {
-            "$ref": "./icons/created.json"
-        },
-        "updated": {
-            "$ref": "./icons/updated.json"
+        "iconset": {
+            "$ref": "./icons/iconset.json"
         },
         "name": {
             "$ref": "./icons/name.json"
         },
-        "iconset": {
-            "$ref": "./icons/iconset.json"
-        },
         "type2525b": {
             "$ref": "./icons/type2525b.json"
         },
+        "created": {
+            "$ref": "./icons/created.json"
+        },
+        "updated": {
+            "$ref": "./icons/updated.json"
+        },
         "data": {
             "$ref": "./icons/data.json"
         },
         "path": {
             "$ref": "./icons/path.json"
+        },
+        "id": {
+            "$ref": "./icons/id.json"
         }
     },
     "required": [
-        "id",
-        "created",
-        "updated",
-        "name",
         "iconset",
+        "name",
         "type2525b",
+        "created",
+        "updated",
         "data",
-        "path"
+        "path",
+        "id"
     ]
 }

api/schema/iconsets.json

@@ -5,12 +5,6 @@
         "uid": {
             "$ref": "./iconsets/uid.json"
         },
-        "created": {
-            "$ref": "./iconsets/created.json"
-        },
-        "updated": {
-            "$ref": "./iconsets/updated.json"
-        },
         "version": {
             "$ref": "./iconsets/version.json"
         },
@@ -34,19 +28,25 @@
         },
         "skip_resize": {
             "$ref": "./iconsets/skip_resize.json"
+        },
+        "created": {
+            "$ref": "./iconsets/created.json"
+        },
+        "updated": {
+            "$ref": "./iconsets/updated.json"
         }
     },
     "required": [
         "uid",
-        "created",
-        "updated",
         "version",
         "name",
         "default_group",
         "default_friendly",
         "default_hostile",
         "default_neutral",
         "default_unknown",
-        "skip_resize"
+        "skip_resize",
+        "created",
+        "updated"
     ]
 }

api/schema/imports.json

@@ -11,9 +11,6 @@
         "updated": {
             "$ref": "./imports/updated.json"
         },
-        "name": {
-            "$ref": "./imports/name.json"
-        },
         "status": {
             "$ref": "./imports/status.json"
         },
@@ -23,30 +20,33 @@
         "result": {
             "$ref": "./imports/result.json"
         },
+        "name": {
+            "$ref": "./imports/name.json"
+        },
         "username": {
             "$ref": "./imports/username.json"
         },
         "mode": {
             "$ref": "./imports/mode.json"
         },
-        "mode_id": {
-            "$ref": "./imports/mode_id.json"
-        },
         "config": {
             "$ref": "./imports/config.json"
+        },
+        "mode_id": {
+            "$ref": "./imports/mode_id.json"
         }
     },
     "required": [
         "id",
         "created",
         "updated",
-        "name",
         "status",
         "error",
         "result",
+        "name",
         "username",
         "mode",
-        "mode_id",
-        "config"
+        "config",
+        "mode_id"
     ]
 }

api/schema/layer_alerts/layer.json

@@ -1,5 +1,5 @@
 {
     "type": "number",
     "description": "",
-    "$comment": "int4"
+    "$comment": "int8"
 }

api/schema/layers.json

@@ -5,15 +5,15 @@
         "id": {
             "$ref": "./layers/id.json"
         },
+        "name": {
+            "$ref": "./layers/name.json"
+        },
         "created": {
             "$ref": "./layers/created.json"
         },
         "updated": {
             "$ref": "./layers/updated.json"
         },
-        "name": {
-            "$ref": "./layers/name.json"
-        },
         "description": {
             "$ref": "./layers/description.json"
         },
@@ -59,9 +59,9 @@
     },
     "required": [
         "id",
+        "name",
         "created",
         "updated",
-        "name",
         "description",
         "enabled",
         "enabled_styles",

api/schema/layers/connection.json

@@ -1,5 +1,8 @@
 {
-    "type": "number",
+    "type": [
+        "number",
+        "null"
+    ],
     "description": "",
     "$comment": "int4"
 }

api/schema/layers/created.json

@@ -1,6 +1,6 @@
 {
     "type": "string",
-    "description": "",
+    "description": "Creation TimeStamp",
     "$comment": "timestamptz",
     "format": "date-time"
 }

api/schema/layers/cron.json

@@ -1,8 +1,5 @@
 {
-    "type": [
-        "string",
-        "null"
-    ],
+    "type": "string",
     "description": "",
     "$comment": "text"
 }

api/schema/layers/data.json

@@ -1,5 +1,8 @@
 {
-    "type": "number",
+    "type": [
+        "number",
+        "null"
+    ],
     "description": "",
     "$comment": "int4"
 }

api/schema/layers/description.json

@@ -1,5 +1,5 @@
 {
     "type": "string",
-    "description": "",
+    "description": "Human readable description",
     "$comment": "text"
 }

api/schema/layers/enabled.json

@@ -1,5 +1,5 @@
 {
     "type": "boolean",
-    "description": "",
+    "description": "Is the layer passing CoT messages",
     "$comment": "bool"
 }

api/schema/layers/enabled_styles.json

@@ -1,5 +1,5 @@
 {
     "type": "boolean",
-    "description": "",
+    "description": "Is styling enabled for the layer",
     "$comment": "bool"
 }

api/schema/layers/id.json

@@ -1,5 +1,5 @@
 {
     "type": "number",
-    "description": "",
+    "description": "Unique Layer ID",
     "$comment": "int4"
 }

api/schema/layers/name.json

@@ -1,5 +1,5 @@
 {
     "type": "string",
-    "description": "",
+    "description": "Unique human readable name",
     "$comment": "text"
 }

api/schema/layers/styles.json

@@ -1,5 +1,5 @@
 {
     "type": "object",
-    "description": "",
+    "description": "Styling rules for the layer",
     "$comment": "json"
 }

api/schema/layers/updated.json

@@ -1,6 +1,6 @@
 {
     "type": "string",
-    "description": "",
+    "description": "Updated TimeStamp",
     "$comment": "timestamptz",
     "format": "date-time"
 }