@remix_labs/mixc-starter 2.8742.0-dev → 2.8746.0-dev

package/common.js

@@ -4,13 +4,7 @@ let terminate = function(f) {};
 
 async function StartMixCompiler(hub, config) {
     console.log("PROTOQUERY_BUILD (mixc-starter)", PROTOQUERY_BUILD);
-    let topicPrefix = config.topicPrefix;
-    if (topicPrefix == undefined || topicPrefix == "") {
-        let org = config.org || "local";
-        let workspace = config.workspace || "local";
-        topicPrefix = "/org/" + org + "/ws/" + workspace;
-    };
-    let mixc_topic = topicPrefix + "/mixc";
+    let mixc_topic = "/org/" + config.org + "/ws/" + config.workspace + "/mixc";
     let channel = await hub.newChannel();
     await channel.setLocalPubTopic(mixc_topic);
     await channel.setLocalSubTopic(mixc_topic);
@@ -19,7 +13,8 @@ async function StartMixCompiler(hub, config) {
     let worker = globalThis.GetMixcWorker();
     let config_msg =
         { "_rmx_type": "msg_mixc_configure",
-          "topicPrefix": topicPrefix,
+          "org": config.org,
+          "workspace": config.workspace,
           "hub": channel.port,
           "wasm_base": config.wasm_base,  // may be undefined
         };
@@ -29,14 +24,8 @@ async function StartMixCompiler(hub, config) {
 }
 
 async function WaitForMixCompiler(hub, config) {
-    let topicPrefix = config.topicPrefix;
-    if (topicPrefix == undefined || topicPrefix == "") {
-        let org = config.org || "local";
-        let workspace = config.workspace || "local";
-        topicPrefix = "/org/" + org + "/ws/" + workspace;
-    };
     let ch = await hub.newChannel();
-    let sub = await ch.subscribe(topicPrefix + "/mixc/announce");
+    let sub = await ch.subscribe("/org/" + config.org + "/ws/" + config.workspace + "/mixc/announce");
     let msg = { success: false };
     while (!msg.success) {
         msg = await sub.next();

package/mixc-worker.node.mjs

@@ -22279,8 +22279,8 @@ var dist_default = /*#__PURE__*/__webpack_require__.n(wasi_js_dist);
 var browser = __webpack_require__(7986);
 var browser_default = /*#__PURE__*/__webpack_require__.n(browser);
 ;// CONCATENATED MODULE: ./protoquery_build.js
-var PROTOQUERY_WASM_BUILD = "8742";
-var PROTOQUERY_STDLIB_ID = "stdlib-1@b5903abc757b03e2a3ad88980131ebf3";
+var PROTOQUERY_WASM_BUILD = "8746";
+var PROTOQUERY_STDLIB_ID = "stdlib-1@f07a7a88c480a0cce736b53c9f7fd0b3";
 
 
 ;// CONCATENATED MODULE: ./node_modules/wasm-feature-detect/dist/esm/index.js
@@ -22393,7 +22393,8 @@ function onmessage(ev) {
 async function configure(msg) {
     globalThis.hub = new Channel(msg.hub);
     globalThis.config = {
-        topicPrefix: msg.topicPrefix,
+        org: msg.org || "local",
+        workspace: msg.workspace || "local",
         wasm_base: msg.wasm_base || ("https://storage.googleapis.com/rmx-static/protoquery/" + PROTOQUERY_WASM_BUILD),
     };
     globalThis.stringIdMap = new Map();
@@ -22404,7 +22405,7 @@ async function configure(msg) {
     sub_sessionless();  // no await
     let announcement = new JSONMessage("msg_mixc_announce", "mixc-worker", {success:true, stdlib: PROTOQUERY_STDLIB_ID, hello: "hi" });
     let retained = true;
-    await globalThis.hub.publish(globalThis.config.topicPrefix + "/mixc/announce", announcement, retained);
+    await globalThis.hub.publish("/org/" + globalThis.config.org + "/ws/" + globalThis.config.workspace + "/mixc/announce", announcement, retained);
 }
 
 async function logMaskSub(sub) {
@@ -22422,7 +22423,7 @@ async function logMaskSubLoop(sub) {
 }
 
 async function sub_sessionless() {
-    let topicBase = globalThis.config.topicPrefix + "/mixc";
+    let topicBase = "/org/" + globalThis.config.org + "/ws/" + globalThis.config.workspace + "/mixc";
     let sub = await globalThis.hub.subscribe(topicBase + "/sessionless");
     sub_sessionless_loop(sub); // no await
 }
@@ -22483,8 +22484,16 @@ function check_responseTopic(rtopic) {
         worker_console.error("mixc: invalid responseTopic");
         return false;
     };
-    let rtopicExpected = globalThis.config.topicPrefix + "/mixc/response/";
-    let rtopicOk = rtopic.startsWith(rtopicExpected);
+    let rtopicArray = rtopic.split("/");
+    let rtopicOk =
+        rtopicArray.length == 8 &&
+        rtopicArray[0] == "" &&
+        rtopicArray[1] == "org" &&
+        rtopicArray[2] == globalThis.config.org &&
+        rtopicArray[3] == "ws" &&
+        rtopicArray[4] == globalThis.config.workspace &&
+        rtopicArray[5] == "mixc" &&
+        rtopicArray[6] == "response";
     if (!rtopicOk) {
         worker_console.error("mixc: invalid responseTopic");
         return false;
@@ -22596,7 +22605,7 @@ async function handle_request(rtopic, req_name, msg, req_hasArg, req_binArg, wit
             new JSONMessage("msg_mixc_response", "mixc-worker", responsePayload);
     };
     if (resp.json.success && req_name == "Create_session") {
-        let topicBase = globalThis.config.topicPrefix + "/mixc";
+        let topicBase = "/org/" + globalThis.config.org + "/ws/" + globalThis.config.workspace + "/mixc";
         let sessionBase = topicBase + "/session/" + stringId;
         let sub = await globalThis.hub.subscribe(sessionBase + "/request");
         sub_session_loop(compilerId, sessionBase, sub);  // no await

package/mixc-worker.worker.js

@@ -24235,8 +24235,8 @@ var dist_default = /*#__PURE__*/__webpack_require__.n(dist);
 var browser = __webpack_require__(7986);
 var browser_default = /*#__PURE__*/__webpack_require__.n(browser);
 ;// CONCATENATED MODULE: ./protoquery_build.js
-var PROTOQUERY_WASM_BUILD = "8742";
-var PROTOQUERY_STDLIB_ID = "stdlib-1@b5903abc757b03e2a3ad88980131ebf3";
+var PROTOQUERY_WASM_BUILD = "8746";
+var PROTOQUERY_STDLIB_ID = "stdlib-1@f07a7a88c480a0cce736b53c9f7fd0b3";
 
 
 ;// CONCATENATED MODULE: ./node_modules/wasm-feature-detect/dist/esm/index.js
@@ -24330,7 +24330,8 @@ function onmessage(ev) {
 async function configure(msg) {
     globalThis.hub = new Channel(msg.hub);
     globalThis.config = {
-        topicPrefix: msg.topicPrefix,
+        org: msg.org || "local",
+        workspace: msg.workspace || "local",
         wasm_base: msg.wasm_base || ("https://storage.googleapis.com/rmx-static/protoquery/" + PROTOQUERY_WASM_BUILD),
     };
     globalThis.stringIdMap = new Map();
@@ -24341,7 +24342,7 @@ async function configure(msg) {
     sub_sessionless();  // no await
     let announcement = new JSONMessage("msg_mixc_announce", "mixc-worker", {success:true, stdlib: PROTOQUERY_STDLIB_ID, hello: "hi" });
     let retained = true;
-    await globalThis.hub.publish(globalThis.config.topicPrefix + "/mixc/announce", announcement, retained);
+    await globalThis.hub.publish("/org/" + globalThis.config.org + "/ws/" + globalThis.config.workspace + "/mixc/announce", announcement, retained);
 }
 
 async function logMaskSub(sub) {
@@ -24359,7 +24360,7 @@ async function logMaskSubLoop(sub) {
 }
 
 async function sub_sessionless() {
-    let topicBase = globalThis.config.topicPrefix + "/mixc";
+    let topicBase = "/org/" + globalThis.config.org + "/ws/" + globalThis.config.workspace + "/mixc";
     let sub = await globalThis.hub.subscribe(topicBase + "/sessionless");
     sub_sessionless_loop(sub); // no await
 }
@@ -24420,8 +24421,16 @@ function check_responseTopic(rtopic) {
         worker_console.error("mixc: invalid responseTopic");
         return false;
     };
-    let rtopicExpected = globalThis.config.topicPrefix + "/mixc/response/";
-    let rtopicOk = rtopic.startsWith(rtopicExpected);
+    let rtopicArray = rtopic.split("/");
+    let rtopicOk =
+        rtopicArray.length == 8 &&
+        rtopicArray[0] == "" &&
+        rtopicArray[1] == "org" &&
+        rtopicArray[2] == globalThis.config.org &&
+        rtopicArray[3] == "ws" &&
+        rtopicArray[4] == globalThis.config.workspace &&
+        rtopicArray[5] == "mixc" &&
+        rtopicArray[6] == "response";
     if (!rtopicOk) {
         worker_console.error("mixc: invalid responseTopic");
         return false;
@@ -24533,7 +24542,7 @@ async function handle_request(rtopic, req_name, msg, req_hasArg, req_binArg, wit
             new JSONMessage("msg_mixc_response", "mixc-worker", responsePayload);
     };
     if (resp.json.success && req_name == "Create_session") {
-        let topicBase = globalThis.config.topicPrefix + "/mixc";
+        let topicBase = "/org/" + globalThis.config.org + "/ws/" + globalThis.config.workspace + "/mixc";
         let sessionBase = topicBase + "/session/" + stringId;
         let sub = await globalThis.hub.subscribe(sessionBase + "/request");
         sub_session_loop(compilerId, sessionBase, sub);  // no await

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/mixc-starter",
-  "version": "2.8742.0-dev",
+  "version": "2.8746.0-dev",
   "description": "start the compiler in a web worker",
   "main": "node.js",
   "browser": "index.js",

package/protoquery_build.js

@@ -1,3 +1,3 @@
-var PROTOQUERY_BUILD = "43970";
-var PROTOQUERY_WASM_BUILD = "8742";
+var PROTOQUERY_BUILD = "43996";
+var PROTOQUERY_WASM_BUILD = "8746";
 export { PROTOQUERY_BUILD, PROTOQUERY_WASM_BUILD }