@primate/native 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/native",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Primate native applications",
   "homepage": "https://primatejs.com/modules/native",
   "bugs": "https://github.com/primatejs/primate/issues",
@@ -16,14 +16,15 @@
   },
   "dependencies": {
     "@rcompat/cli": "^0.5.1",
-    "@rcompat/fs": "^0.5.0",
+    "@rcompat/fs": "^0.5.1",
     "@rcompat/stdio": "^0.5.0",
     "@rcompat/webview": "^0.7.0",
-    "@primate/core": "^0.1.5"
+    "@primate/core": "^0.1.7"
   },
   "type": "module",
   "exports": {
-    "./worker": "./src/worker.js",
-    ".": "./src/index.js"
+    ".": "./src/index.js",
+    "./*": "./src/public/*.js",
+    "./platform/*": "./src/platform/*.js"
   }
 }

package/src/desktop.js

@@ -1,4 +1,5 @@
 import collect from "@rcompat/fs/collect";
+import join from "@rcompat/fs/join";
 import webpath from "@rcompat/fs/webpath";
 
 const html = /^.*.html$/u;
@@ -9,9 +10,9 @@ export default async app => {
   const client = app.runpath(location.client);
   const re = /app..*(?:js|css)$/u;
 
-  const import_statics = (await client.collect()).map((path, i) => `
+  const static_imports = (await client.collect()).map((path, i) => `
     import static${i} from "${webpath(`./client${path.debase(client)}`)}" with { type: "file" };
-    statics["${webpath(path.debase(client))}"] = await file(static${i});`)
+    static_imports["${webpath(path.debase(client))}"] = static${i};`)
     .join("\n");
 
   const $imports = (await Promise.all((await client.collect(re, { recursive: false }))
@@ -22,94 +23,62 @@ export default async app => {
       return {
         src,
         path,
-        code: `await file(asset${i}).text()`,
+        code: `await load_text(asset${i})`,
         type,
         empty: (await file.text()).length === 0,
       };
     }))).filter(file => !file.empty);
-  const d = app.runpath(location.pages);
+  const d = app.runpath(location.server, location.pages);
   const pages = await Promise.all((await collect(d, html, { recursive: true }))
     .map(async file => `${file}`.replace(`${d}/`, _ => "")));
   const app_js = $imports.find($import => $import.src.endsWith(".js"));
 
   const assets_scripts = `
-  import Webview from "@rcompat/webview/worker/${app.build_target}";
-  import join from "@rcompat/fs/join";
-  import file from "@rcompat/fs/file";
-  import stringify from "@rcompat/object/stringify";
-  import crypto from "@rcompat/crypto";
-  import { OK } from "@rcompat/http/status";
-  import { resolve } from "@rcompat/http/mime";
+  import Webview from "@primate/native/platform/${app.build_target}";
+  import loader from "@primate/native/loader";
+  import load_text from "primate/load-text";
 
-  const encoder = new TextEncoder();
-  const hash = async (data, algorithm = "sha-384") => {
-    const bytes = await crypto.subtle.digest(algorithm, encoder.encode(data));
-    const prefix = algorithm.replace("-", _ => "");
-    return \`\${prefix}-\${btoa(String.fromCharCode(...new Uint8Array(bytes)))}\`;
-  };
-
-  const statics = {};
-  ${import_statics}
+  const static_imports = {};
+  ${static_imports}
 
   ${$imports.map(({ path }, i) =>
     `import asset${i} from "${path}" with { type: "file" };
-    const file${i} = await file(asset${i}).text();`).join("\n  ")}
+    const file${i} = await load_text(asset${i});`).join("\n  ")}
   const assets = [${$imports.map(($import, i) => `{
   src: "${$import.src}",
   code: file${i},
   type: "${$import.type}",
   inline: false,
-  integrity: await hash(file${i}),
   }`).join(",\n  ")}];
 
   ${app_js === undefined ? "" :
-    `const imports = {
-     app: join("${http.static.root}", "${$imports.find($import =>
-  $import.src.includes("app") && $import.src.endsWith(".js")).src}").webpath(),
+    `
+    const imports = {
+     app: "${join(http.static.root, $imports.find($import =>
+    $import.src.includes("app") && $import.src.endsWith(".js")).src).webpath()}"
     };
     // importmap
     assets.push({
       inline: true,
-      code: stringify({ imports }),
+      code: { imports },
       type: "importmap",
-      integrity: await hash(stringify({ imports })),
     });`}
 
+  const page_imports = {};
   ${pages.map((page, i) =>
-    `import i_page${i} from "${webpath(`./${location.pages}/${page}`)}" with { type: "file" };
-    const page${i} = await file(i_page${i}).text();`).join("\n  ")}
+    `import page${i} from "${webpath(`./${location.server}/${location.pages}/${page}`)}" with { type: "file" };
+    page_imports["${page}"] = page${i};`).join("\n  ")}
 
-  const pages = {
-  ${pages.map((page, i) => `"${page}": page${i},`).join("\n  ")}
+  export default {
+    assets,
+    loader: await loader({
+      page_imports,
+      static_imports,
+      pages_app: "${app.get("pages.app")}",
+      Webview,
+    }),
+    target: "${app.build_target}",
   };
-  const serve_asset = asset => new Response(asset.stream(), {
-    status: OK,
-    headers: {
-      "Content-Type": resolve(asset.name),
-    },
-  });
-
-  const loader = {
-    page(name) {
-      return pages[name] ?? pages["${app.get("pages.app")}"];
-    },
-    asset(pathname) {
-      const root_asset = statics[pathname];
-      if (root_asset !== undefined) {
-        return serve_asset(root_asset);
-      }
-      const static_asset = statics[\`/static\${pathname}\`];
-      if (static_asset !== undefined) {
-        return serve_asset(static_asset);
-      }
-    },
-    webview() {
-      return Webview;
-    }
-  };
-  const target = "${app.build_target}";
-
-  export { assets, loader, target };
 `;
   await app.path.build.join("target.js").write(assets_scripts);
 

package/src/platform/darwin-arm64.js

@@ -0,0 +1 @@
+export { default } from "@rcompat/webview/worker/darwin-arm64";

package/src/platform/darwin-x64.js

@@ -0,0 +1 @@
+export { default } from "@rcompat/webview/worker/darwin-x64";

package/src/platform/linux-x64.js

@@ -0,0 +1 @@
+export { default } from "@rcompat/webview/worker/linux-x64";

package/src/platform/windows-x64.js

@@ -0,0 +1 @@
+export { default } from "@rcompat/webview/worker/windows-x64";

package/src/public/loader.js

@@ -0,0 +1,36 @@
+import serve_asset from "primate/serve-asset";
+import file from "@rcompat/fs/file";
+
+const load = async resource_map =>
+  Object.fromEntries(await Promise.all(Object.entries(resource_map).map(
+    async ([key, url]) => [key, await file(url).text()])));
+
+export default async ({
+  pages_app,
+  page_imports,
+  static_imports,
+  Webview,
+}) => {
+  const statics = Object.fromEntries(Object.entries(static_imports).map(
+    ([key, url]) => [key, file(url)]));
+  const pages = await load(page_imports);
+
+  return {
+    page(name) {
+      return pages[name] ?? pages[pages_app];
+    },
+    asset(pathname) {
+      const root_asset = statics[pathname];
+      if (root_asset !== undefined) {
+        return serve_asset(root_asset);
+      }
+      const static_asset = statics[`/static${pathname}`];
+      if (static_asset !== undefined) {
+        return serve_asset(static_asset);
+      }
+    },
+    webview() {
+      return Webview;
+    },
+  };
+};