@malloydata/malloy 0.0.240-dev250305162504 → 0.0.240-dev250305213425

package/dist/api/sessioned.d.ts

@@ -4,7 +4,14 @@ export type TTL = {
 } | Date;
 export interface OptionsBase {
     ttl?: TTL;
+    session_id?: string;
 }
-export declare function compileModel(request: Malloy.CompileModelRequest, options?: OptionsBase): Malloy.CompileModelResponse;
-export declare function compileSource(request: Malloy.CompileSourceRequest, options?: OptionsBase): Malloy.CompileSourceResponse;
-export declare function compileQuery(request: Malloy.CompileQueryRequest, options?: OptionsBase): Malloy.CompileQueryResponse;
+export declare function compileModel(request: Malloy.CompileModelRequest, options?: OptionsBase): Malloy.CompileModelResponse & {
+    session_id: string;
+};
+export declare function compileSource(request: Malloy.CompileSourceRequest, options?: OptionsBase): Malloy.CompileSourceResponse & {
+    session_id: string;
+};
+export declare function compileQuery(request: Malloy.CompileQueryRequest, options?: OptionsBase): Malloy.CompileQueryResponse & {
+    session_id: string;
+};

package/dist/api/sessioned.js

@@ -32,6 +32,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileQuery = exports.compileSource = exports.compileModel = void 0;
 const Malloy = __importStar(require("@malloydata/malloy-interfaces"));
 const Core = __importStar(require("./core"));
+const uuid_1 = require("uuid");
 function sessionInfosMatch(a, b) {
     if (a.type === 'compile_model') {
         if (b.type !== 'compile_model')
@@ -53,18 +54,23 @@ function sessionInfosMatch(a, b) {
 }
 class SessionManager {
     constructor() {
-        this.sessions = [];
+        this.sessions = new Map();
     }
-    purgeExpired(except) {
+    purgeExpired(options) {
         const now = new Date();
-        this.sessions = this.sessions.filter(s => (except && sessionInfosMatch(s.sessionInfo, except)) ||
-            s.expires === undefined ||
-            s.expires > now);
+        for (const session of this.sessions.values()) {
+            if (session.sessionId === (options === null || options === void 0 ? void 0 : options.except))
+                continue;
+            if (session.expires && session.expires < now) {
+                this.sessions.delete(session.sessionId);
+            }
+        }
     }
-    findSession(sessionInfo) {
-        const session = this.sessions.find(s => sessionInfosMatch(s.sessionInfo, sessionInfo));
-        this.purgeExpired(sessionInfo);
-        return session;
+    findSession(sessionId, sessionInfo) {
+        const session = this.sessions.get(sessionId);
+        if (session && sessionInfosMatch(session.sessionInfo, sessionInfo)) {
+            return session;
+        }
     }
     getExpires(ttl) {
         if (ttl instanceof Date) {
@@ -75,6 +81,13 @@ class SessionManager {
             return new Date(Date.now() + ttl.seconds * 1000);
         }
     }
+    newSessionId() {
+        let id;
+        do {
+            id = (0, uuid_1.v4)();
+        } while (this.sessions.has(id));
+        return id;
+    }
     newCompileModelSession(request, sessionInfo, options) {
         const expires = (options === null || options === void 0 ? void 0 : options.ttl) ? this.getExpires(options.ttl) : undefined;
         const state = Core.newCompileModelState(request);
@@ -83,6 +96,7 @@ class SessionManager {
             sessionInfo,
             state,
             expires,
+            sessionId: this.newSessionId(),
         };
     }
     newCompileSourceSession(request, sessionInfo, options) {
@@ -93,6 +107,7 @@ class SessionManager {
             sessionInfo,
             state,
             expires,
+            sessionId: this.newSessionId(),
         };
     }
     newCompileQuerySession(request, sessionInfo, options) {
@@ -103,16 +118,17 @@ class SessionManager {
             sessionInfo,
             state,
             expires,
+            sessionId: this.newSessionId(),
         };
     }
-    findCompileModelSession(sessionInfo) {
-        const session = this.findSession(sessionInfo);
+    findCompileModelSession(sessionId, sessionInfo) {
+        const session = this.findSession(sessionId, sessionInfo);
         if ((session === null || session === void 0 ? void 0 : session.type) === 'compile_model') {
             return session;
         }
     }
-    killSession(sessionInfo) {
-        this.sessions = this.sessions.filter(s => !sessionInfosMatch(s.sessionInfo, sessionInfo));
+    killSession(sessionId) {
+        this.sessions.delete(sessionId);
     }
     hasErrors(log) {
         var _a;
@@ -124,22 +140,27 @@ class SessionManager {
             modelURL: request.model_url,
             extendModelURL: request.extend_model_url,
         };
-        let session = this.findCompileModelSession(sessionInfo);
+        let session = (options === null || options === void 0 ? void 0 : options.session_id) &&
+            this.findCompileModelSession(options.session_id, sessionInfo);
+        this.purgeExpired({ except: options === null || options === void 0 ? void 0 : options.session_id });
         if (session) {
+            if (options === null || options === void 0 ? void 0 : options.ttl) {
+                session.expires = this.getExpires(options.ttl);
+            }
             Core.updateCompileModelState(session.state, request.compiler_needs);
         }
         else {
             session = this.newCompileModelSession(request, sessionInfo, options);
-            this.sessions.push(session);
+            this.sessions.set(session.sessionId, session);
         }
         const result = Core.statedCompileModel(session.state);
         if (result.model || this.hasErrors(result.logs)) {
-            this.killSession(sessionInfo);
+            this.killSession(session.sessionId);
         }
-        return result;
+        return { ...result, session_id: session.sessionId };
     }
-    findCompileSourceSession(sessionInfo) {
-        const session = this.findSession(sessionInfo);
+    findCompileSourceSession(sessionId, sessionInfo) {
+        const session = this.findSession(sessionId, sessionInfo);
         if ((session === null || session === void 0 ? void 0 : session.type) === 'compile_source') {
             return session;
         }
@@ -151,22 +172,27 @@ class SessionManager {
             name: request.name,
             extendModelURL: request.extend_model_url,
         };
-        let session = this.findCompileSourceSession(sessionInfo);
+        let session = (options === null || options === void 0 ? void 0 : options.session_id) &&
+            this.findCompileSourceSession(options.session_id, sessionInfo);
+        this.purgeExpired({ except: options === null || options === void 0 ? void 0 : options.session_id });
         if (session) {
+            if (options === null || options === void 0 ? void 0 : options.ttl) {
+                session.expires = this.getExpires(options.ttl);
+            }
             Core.updateCompileModelState(session.state, request.compiler_needs);
         }
         else {
             session = this.newCompileSourceSession(request, sessionInfo, options);
-            this.sessions.push(session);
+            this.sessions.set(session.sessionId, session);
         }
         const result = Core.statedCompileSource(session.state, request.name);
         if (result.source || this.hasErrors(result.logs)) {
-            this.killSession(sessionInfo);
+            this.killSession(session.sessionId);
         }
-        return result;
+        return { ...result, session_id: session.sessionId };
     }
-    findCompileQuerySession(sessionInfo) {
-        const session = this.findSession(sessionInfo);
+    findCompileQuerySession(sessionId, sessionInfo) {
+        const session = this.findSession(sessionId, sessionInfo);
         if ((session === null || session === void 0 ? void 0 : session.type) === 'compile_query') {
             return session;
         }
@@ -179,19 +205,24 @@ class SessionManager {
             queryString,
             query: request.query,
         };
-        let session = this.findCompileQuerySession(sessionInfo);
+        let session = (options === null || options === void 0 ? void 0 : options.session_id) &&
+            this.findCompileQuerySession(options.session_id, sessionInfo);
+        this.purgeExpired({ except: options === null || options === void 0 ? void 0 : options.session_id });
         if (session) {
+            if (options === null || options === void 0 ? void 0 : options.ttl) {
+                session.expires = this.getExpires(options.ttl);
+            }
             Core.updateCompileModelState(session.state, request.compiler_needs);
         }
         else {
             session = this.newCompileQuerySession(request, sessionInfo, options);
-            this.sessions.push(session);
+            this.sessions.set(session.sessionId, session);
         }
         const result = Core.statedCompileQuery(session.state);
         if (result.result || this.hasErrors(result.logs)) {
-            this.killSession(sessionInfo);
+            this.killSession(session.sessionId);
         }
-        return result;
+        return { ...result, session_id: session.sessionId };
     }
 }
 const SESSION_MANAGER = new SessionManager();

package/dist/api/sessioned.spec.js

@@ -33,7 +33,7 @@ describe('api', () => {
                         },
                     ],
                 },
-            });
+            }, { session_id: result.session_id });
             expected = {
                 compiler_needs: {
                     table_schemas: [
@@ -44,6 +44,7 @@ describe('api', () => {
                     ],
                     connections: [{ name: 'connection' }],
                 },
+                session_id: result.session_id,
             };
             expect(result).toMatchObject(expected);
             result = (0, sessioned_1.compileModel)({
@@ -66,7 +67,7 @@ describe('api', () => {
                     ],
                     connections: [{ name: 'connection', dialect: 'duckdb' }],
                 },
-            });
+            }, { session_id: result.session_id });
             expected = {
                 model: {
                     entries: [
@@ -86,6 +87,7 @@ describe('api', () => {
                     ],
                     anonymous_queries: [],
                 },
+                session_id: result.session_id,
             };
             expect(result).toMatchObject(expected);
         });
@@ -135,7 +137,7 @@ describe('api', () => {
                     ],
                     connections: [{ name: 'connection', dialect: 'duckdb' }],
                 },
-            });
+            }, { session_id: result.session_id });
             expected = {
                 source: {
                     name: 'flights',
@@ -149,6 +151,7 @@ describe('api', () => {
                         ],
                     },
                 },
+                session_id: result.session_id,
             };
             expect(result).toMatchObject(expected);
         });
@@ -197,7 +200,7 @@ describe('api', () => {
                         },
                     ],
                 },
-            });
+            }, { session_id: result.session_id });
             expected = {
                 compiler_needs: {
                     table_schemas: [
@@ -231,7 +234,7 @@ describe('api', () => {
                     ],
                     connections: [{ name: 'connection', dialect: 'duckdb' }],
                 },
-            });
+            }, { session_id: result.session_id });
             expected = {
                 result: {
                     connection_name: 'connection',
@@ -251,6 +254,7 @@ ORDER BY 1 asc NULLS LAST
                         ],
                     },
                 },
+                session_id: result.session_id,
             };
             expect(result).toMatchObject(expected);
         });
@@ -264,6 +268,7 @@ ORDER BY 1 asc NULLS LAST
                     // This is in the past...
                     ttl: new Date(Date.now() - 1000),
                 });
+                const session_id = result.session_id;
                 let expected = {
                     compiler_needs: {
                         files: [
@@ -277,19 +282,72 @@ ORDER BY 1 asc NULLS LAST
                 (0, sessioned_1.compileModel)({
                     model_url: 'file://some_other_model.malloy',
                 });
-                result = (0, sessioned_1.compileModel)({
+                result = (0, sessioned_1.compileModel)({ model_url: 'file://test.malloy' }, { session_id });
+                expected = {
+                    compiler_needs: {
+                        files: [
+                            {
+                                url: 'file://test.malloy',
+                            },
+                        ],
+                    },
+                };
+                expect(result).toMatchObject(expected);
+                // New session
+                expect(result.session_id).not.toBe(session_id);
+            });
+            test('ttl should be updated if set in a subsequent request', () => {
+                let result = (0, sessioned_1.compileModel)({
                     model_url: 'file://test.malloy',
+                }, {
+                    // This is in the past...
+                    ttl: new Date(Date.now() - 1000),
                 });
-                expected = {
+                const session_id = result.session_id;
+                let expected = {
+                    compiler_needs: {
+                        files: [
+                            {
+                                url: 'file://test.malloy',
+                            },
+                        ],
+                    },
+                };
+                expect(result).toMatchObject(expected);
+                result = (0, sessioned_1.compileModel)({
+                    model_url: 'file://test.malloy',
                     compiler_needs: {
                         files: [
                             {
                                 url: 'file://test.malloy',
+                                contents: 'source: flights is connection.table("flights")',
+                            },
+                        ],
+                    },
+                }, {
+                    session_id,
+                    // Update TTL to be far in the future
+                    ttl: { seconds: 100000 },
+                });
+                expected = {
+                    compiler_needs: {
+                        table_schemas: [
+                            {
+                                connection_name: 'connection',
+                                name: 'flights',
                             },
                         ],
+                        connections: [{ name: 'connection' }],
                     },
+                    session_id,
                 };
                 expect(result).toMatchObject(expected);
+                // Now asking for a different file should NOT purge the original session
+                (0, sessioned_1.compileModel)({
+                    model_url: 'file://some_other_model.malloy',
+                });
+                result = (0, sessioned_1.compileModel)({ model_url: 'file://test.malloy' }, { session_id });
+                expect(result).toMatchObject(expected);
             });
         });
         test('getting an error should kill session', () => {
@@ -333,10 +391,9 @@ ORDER BY 1 asc NULLS LAST
                     },
                 ],
             };
+            const session_id = result.session_id;
             expect(result).toMatchObject(expected);
-            result = (0, sessioned_1.compileModel)({
-                model_url: 'file://test.malloy',
-            });
+            result = (0, sessioned_1.compileModel)({ model_url: 'file://test.malloy' }, { session_id });
             expected = {
                 compiler_needs: {
                     files: [
@@ -347,6 +404,8 @@ ORDER BY 1 asc NULLS LAST
                 },
             };
             expect(result).toMatchObject(expected);
+            // Should be a new session
+            expect(result.session_id).not.toBe(session_id);
         });
         test('sessions should be cleared when they successfully return a result', () => {
             let result = (0, sessioned_1.compileModel)({
@@ -396,10 +455,9 @@ ORDER BY 1 asc NULLS LAST
                     anonymous_queries: [],
                 },
             };
+            const session_id = result.session_id;
             expect(result).toMatchObject(expected);
-            result = (0, sessioned_1.compileModel)({
-                model_url: 'file://test.malloy',
-            });
+            result = (0, sessioned_1.compileModel)({ model_url: 'file://test.malloy' }, { session_id });
             // Compiler should not know the contents of this file anymore because the session was cleared
             expected = {
                 compiler_needs: {
@@ -411,6 +469,7 @@ ORDER BY 1 asc NULLS LAST
                 },
             };
             expect(result).toMatchObject(expected);
+            expect(result.session_id).not.toBe(session_id);
         });
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.240-dev250305162504",
+  "version": "0.0.240-dev250305213425",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,8 +41,8 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-interfaces": "^0.0.240-dev250305162504",
-    "@malloydata/malloy-tag": "^0.0.240-dev250305162504",
+    "@malloydata/malloy-interfaces": "^0.0.240-dev250305213425",
+    "@malloydata/malloy-tag": "^0.0.240-dev250305213425",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jest-diff": "^29.6.2",