@primate/go 0.3.0 → 0.4.0

package/lib/private/Default.js

@@ -2,11 +2,9 @@ import Runtime from "#Runtime";
 import AppError from "@primate/core/AppError";
 import TAG from "@primate/core/backend/TAG";
 import fail from "@primate/core/fail";
-import location from "@primate/core/location";
 import log from "@primate/core/log";
 import assert from "@rcompat/assert";
 import user from "@rcompat/env/user";
-import runtime from "@rcompat/runtime";
 import execute from "@rcompat/stdio/execute";
 import which from "@rcompat/stdio/which";
 const COMMAND = await which("go");
@@ -19,82 +17,17 @@ const ENV = {
 const REPO = "github.com/primate-run/go";
 const [MAJOR, MINOR] = TAG.split(".").map(Number);
 const run = (wasm, go) => `${COMMAND} build -o ${wasm.name} ${go.name}`;
-function wrapper(path) {
-    return `
-import env from "@primate/go/env";
-import toRequest from "@primate/go/to-request";
-import to_response from "@primate/go/to-response";
-import session from "#session";
-import route from "primate/route";
-
-globalThis.PRMT_SESSION = {
-  get exists() {
-    return session.exists;
-  },
-  get id() {
-    return session.id;
-  },
-  get data() {
-    return JSON.stringify(session.try());
-  },
-  create(data) {
-    session.create(JSON.parse(data));
-  },
-  get() {
-    return JSON.stringify(session.get());
-  },
-  try() {
-    return JSON.stringify(session.try());
-  },
-  set(data) {
-    session.set(JSON.parse(data));
-  },
-  destroy() {
-    session.destroy();
-  },
-};
-
-${runtime === "bun"
-        ? `import route_path from "./${path}" with { type: "file" };
-const binary = await Bun.file(route_path).arrayBuffer();`
-        : `import FileRef from "primate/runtime/FileRef";
-const buffer = await FileRef.arrayBuffer(import.meta.url+"/../${path}");
-const binary = new Uint8Array(buffer);`}
-
-
-env();
-
-// Run Go once to register routes and get available verbs
-const go = new globalThis.Go();
-const result = await WebAssembly.instantiate(binary, go.importObject);
-go.run(result.instance);
-const verbs = globalThis.__primate_verbs || [];
-
-for (const verb of verbs) {
-  route[verb.toLowerCase()](async request => {
-    const requested = await toRequest(request);
-    const _go = new globalThis.Go();
-    return WebAssembly.instantiate(binary, {..._go.importObject}).then(_result => {
-      _go.run(_result.instance);
-      return to_response(globalThis.__primate_handle(verb, requested));
-    });
-  });
-}
-`;
-}
-;
-function postlude(code) {
+function postlude(code, route_id) {
     if (!code.includes(`${REPO}/route`)) {
         log.warn("Go file does not import {0} - skipping route registration", REPO);
         return code;
     }
     return `${code}
-func main() {
-    route.Commit()
-    select{}
-}`;
+    func main() {
+        route.Commit("${route_id}")
+        select{}
+    }`;
 }
-;
 async function check_version() {
     try {
         const version = await execute(`go list -m -f '{{.Version}}' ${REPO}`);
@@ -106,11 +39,11 @@ async function check_version() {
         if (major !== MAJOR || minor !== MINOR) {
             throw fail("installed version {0} not in range {1}", trimmed, TAG);
         }
+        log.info("using {0} package v{1}.{2}.x", REPO, major, minor);
     }
     catch (error) {
         if (error instanceof AppError)
             throw error;
-        console.log(error);
         throw fail("{0} dependency not found - run 'go get {0}@v{1}.0'", REPO, TAG);
     }
 }
@@ -120,12 +53,13 @@ export default class Default extends Runtime {
         app.bind(this.fileExtension, async (route, { context }) => {
             assert(context === "routes", "go: only route files are supported");
             const relative = route.debase(app.path.routes);
-            const basename = relative.path.slice(1, -relative.extension.length);
-            const code = postlude(await route.text());
-            const build_go_file = app.runpath(location.routes, `${basename}.go`);
+            const route_id = relative.path.slice(1, -relative.extension.length);
+            // create a temporary .go file in the build directory for compilation
+            // this is necessary because `go build` requires an actual file on disk
+            const build_go_file = app.runpath("wasm", `${route_id}.go`);
             await build_go_file.directory.create({ recursive: true });
-            await build_go_file.write(code);
-            const wasm = app.runpath(location.routes, `${basename}.wasm`);
+            await build_go_file.write(postlude(await route.text(), route_id));
+            const wasm = app.runpath("wasm", `${route_id}.wasm`);
             try {
                 log.info("compiling {0} to WebAssembly", route);
                 await execute(run(wasm, build_go_file), {
@@ -137,7 +71,11 @@ export default class Default extends Runtime {
                 throw fail("error in module {0}\n{1}", route, error);
             }
             await build_go_file.remove();
-            return wrapper(wasm.name);
+            return `
+        import wrapper from "@primate/go/wrapper";
+        import bytes from "app:wasm/${route_id}.wasm" with { type: "bytes" };
+        await wrapper(bytes, ${JSON.stringify(route_id)});
+      `;
         });
         return next(app);
     }

package/lib/private/to-response.d.ts

@@ -1,9 +1,4 @@
 import type ResponseLike from "@primate/core/response/ResponseLike";
-import type Dict from "@rcompat/type/Dict";
-type Handler = "error" | "redirect" | "view";
-type ResponseType = (() => {
-    handler: Handler;
-} & Dict) | string;
-declare const _default: (response: ResponseType) => ResponseLike;
+declare const _default: (response: any) => ResponseLike;
 export default _default;
 //# sourceMappingURL=to-response.d.ts.map

package/lib/private/to-response.js

@@ -1,24 +1,32 @@
 import error from "@primate/core/response/error";
 import redirect from "@primate/core/response/redirect";
 import view from "@primate/core/response/view";
-const parse = (input) => input === null ? undefined : JSON.parse(input);
-const handle_handler = (handler, response) => {
-    if (handler === "view") {
-        const { component, options, props } = response;
-        return view(component, parse(props), parse(options));
-    }
-    if (handler === "redirect") {
-        const { location, status } = response;
-        return redirect(location, status === null ? undefined : status);
-    }
-    const { options } = response;
-    return error(parse(options));
-};
+const handlers = { error, redirect, view };
+const is_handler = (handler) => typeof handler === "string" && Object.keys(handlers).includes(handler);
 export default (response) => {
-    if (typeof response === "function") {
-        const { handler, ...args } = response();
-        return handle_handler(handler, args);
+    if (typeof response === "string") {
+        try {
+            response = JSON.parse(response);
+        }
+        catch {
+            return response;
+        }
+    }
+    if (response && typeof response === "object") {
+        const handler = response.handler;
+        if (is_handler(handler)) {
+            if (handler === "view") {
+                const { component, props, options } = response;
+                return view(component, props ? JSON.parse(props) : {}, options ? JSON.parse(options) : {});
+            }
+            if (handler === "redirect") {
+                const { location, status } = response;
+                return redirect(location, status);
+            }
+            const { options } = response;
+            return error(options ? JSON.parse(options) : {});
+        }
     }
-    return JSON.parse(response);
+    return response;
 };
 //# sourceMappingURL=to-response.js.map

package/lib/private/wrapper.d.ts

@@ -0,0 +1,12 @@
+declare global {
+    var Go: {
+        new (): {
+            importObject: WebAssembly.Imports;
+            run(instance: WebAssembly.Instance): Promise<void>;
+        };
+    };
+    var PRMT_SESSION: any;
+    var __primate_go_initialized: Set<string> | undefined;
+}
+export default function wrapper(bytes: Uint8Array, routeId: string): Promise<void>;
+//# sourceMappingURL=wrapper.d.ts.map

package/lib/private/wrapper.js

@@ -0,0 +1,52 @@
+import env from "@primate/go/env";
+import toRequest from "@primate/go/to-request";
+import to_response from "@primate/go/to-response";
+import session from "primate/config/session";
+import route from "primate/route";
+export default async function wrapper(bytes, routeId) {
+    if (!globalThis.__primate_go_initialized) {
+        globalThis.__primate_go_initialized = new Set();
+    }
+    globalThis.PRMT_SESSION = {
+        get exists() { return session().exists; },
+        get id() { return session().id; },
+        get data() { return JSON.stringify(session().try()); },
+        create(data) { session().create(JSON.parse(data)); },
+        get() { return JSON.stringify(session().get()); },
+        try() { return JSON.stringify(session().try()); },
+        set(data) { session().set(JSON.parse(data)); },
+        destroy() { session().destroy(); },
+    };
+    env();
+    const safe_route_id = routeId.replace(/\//g, "_");
+    const registry_name = `__primate_go_registry_${safe_route_id}`;
+    const call_go = `__primate_call_go_${safe_route_id}`;
+    delete globalThis[registry_name];
+    delete globalThis[call_go];
+    await new Promise((resolve) => {
+        globalThis[`__primate_go_ready_${safe_route_id}`] = () => {
+            resolve();
+        };
+        const go = new globalThis.Go();
+        WebAssembly.instantiate(bytes, go.importObject).then(result => {
+            go.run(result.instance).catch(err => {
+                console.error("Go runtime error:", routeId, err);
+            });
+        });
+    });
+    const registry_fn = globalThis[registry_name];
+    const registry = registry_fn();
+    const verbs = registry?.length
+        ? Array.from({ length: registry.length }, (_, i) => registry[i])
+        : [];
+    for (const verb of verbs) {
+        route[verb.toLowerCase()](async (request) => {
+            const requested = await toRequest(request);
+            const callFn = globalThis[call_go];
+            const response = callFn(verb, requested);
+            return to_response(response);
+        });
+    }
+    globalThis.__primate_go_initialized.add(routeId);
+}
+//# sourceMappingURL=wrapper.js.map

package/lib/public/wrapper.d.ts

@@ -0,0 +1,2 @@
+export { default } from "#wrapper";
+//# sourceMappingURL=wrapper.d.ts.map

package/lib/public/wrapper.js

@@ -0,0 +1,2 @@
+export { default } from "#wrapper";
+//# sourceMappingURL=wrapper.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/go",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Primate Go backend",
   "homepage": "https://primate.run/docs/backend/go",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -18,15 +18,15 @@
   "dependencies": {
     "@rcompat/assert": "^0.3.1",
     "@rcompat/cli": "^0.11.3",
-    "@rcompat/env": "^0.9.0",
-    "@rcompat/fs": "^0.21.1",
+    "@rcompat/env": "^0.9.2",
+    "@rcompat/fs": "^0.22.3",
     "@rcompat/runtime": "^0.6.0",
     "@rcompat/stdio": "^0.12.2",
     "@rcompat/string": "^0.10.0",
-    "@primate/core": "^0.3.0"
+    "@primate/core": "^0.4.0"
   },
   "peerDependencies": {
-    "primate": "^0.34.0"
+    "primate": "^0.35.0"
   },
   "type": "module",
   "imports": {