@hazae41/bobine 0.0.9 → 0.0.10

package/README.md

@@ -21,8 +21,6 @@ https://bobine.tech/
 
 ### Running the server
 
-#### Running the server via binary
-
 Install the binary with Deno
 
 ```bash
@@ -60,25 +58,11 @@ Run the server
 bobine serve --env=./.env.local
 ```
 
-#### Running the server via library
-
-Install `@hazae41/bobine` and use the `serve()` function
-
-### Creating a module
-
-#### Creating a module via binary
-
-Install the binary with Deno
-
-```bash
-deno install -gf -A jsr:@hazae41/bobine
-```
+Or you can install `@hazae41/bobine` and use the `serve()` function
 
-Deploy your .wasm file
+### Making your own module
 
-```bash
-bobine create ./module.wasm --server=http://localhost:8080
-```
+You can clone my [AssemblyScript starter](https://github.com/hazae41/create-bobine-assemblyscript-module) to get started with AssemblyScript
 
 ### Using the HTTP API
 

package/out/libs/metering/mod.js

@@ -1,17 +1,28 @@
 import * as Wasm from "@hazae41/wasm";
 export function meter(module, from, name) {
-    const wtype = module.body.sections.find(section => section.kind === Wasm.TypeSection.kind);
-    const wimport = module.body.sections.find(section => section.kind === Wasm.ImportSection.kind);
-    const wexport = module.body.sections.find(section => section.kind === Wasm.ExportSection.kind);
-    const wcode = module.body.sections.find(section => section.kind === Wasm.CodeSection.kind);
-    if (wtype == null)
-        throw new Error(`No type section`);
-    if (wimport == null)
-        throw new Error(`No import section`);
-    if (wexport == null)
-        throw new Error(`No export section`);
-    if (wcode == null)
-        throw new Error(`No code section`);
+    let wtype = module.body.sections.find(section => section.kind === Wasm.TypeSection.kind);
+    if (wtype == null) {
+        wtype = new Wasm.TypeSection([]);
+        module.body.sections.unshift(wtype);
+    }
+    let wimport = module.body.sections.find(section => section.kind === Wasm.ImportSection.kind);
+    if (wimport == null) {
+        wimport = new Wasm.ImportSection([]);
+        const before = module.body.sections.findLastIndex(section => section.kind < Wasm.ImportSection.kind);
+        module.body.sections.splice(before + 1, 0, wimport);
+    }
+    let wexport = module.body.sections.find(section => section.kind === Wasm.ExportSection.kind);
+    if (wexport == null) {
+        wexport = new Wasm.ExportSection([]);
+        const before = module.body.sections.findLastIndex(section => section.kind < Wasm.ExportSection.kind);
+        module.body.sections.splice(before + 1, 0, wexport);
+    }
+    let wcode = module.body.sections.find(section => section.kind === Wasm.CodeSection.kind);
+    if (wcode == null) {
+        wcode = new Wasm.CodeSection([]);
+        const before = module.body.sections.findLastIndex(section => section.kind < Wasm.CodeSection.kind);
+        module.body.sections.splice(before + 1, 0, wcode);
+    }
     const wstart = module.body.sections.find(section => section.kind === Wasm.StartSection.kind);
     wtype.descriptors.push({ prefix: Wasm.TypeSection.FuncType.kind, subtypes: [], body: new Wasm.TypeSection.FuncType([0x7f], []) });
     wimport.descriptors.unshift({ from: new TextEncoder().encode(from), name: new TextEncoder().encode(name), body: new Wasm.ImportSection.FunctionImport(wtype.descriptors.length - 1) });

package/out/libs/packs/mod.d.ts

@@ -6,6 +6,6 @@ export declare class Pack {
     writeOrThrow(cursor: Cursor): void;
 }
 export declare namespace Pack {
-    type Value = null | number | bigint | Uint8Array | Pack;
+    type Value = null | Pack | number | Uint8Array | string | bigint;
     function readOrThrow(cursor: Cursor): Pack;
 }

package/out/libs/packs/mod.js

@@ -1,4 +1,4 @@
-/// <reference types="../bytes/lib.d.ts"/>
+// deno-lint-ignore-file no-namespace
 export class Pack {
     values;
     constructor(values) {
@@ -11,22 +11,27 @@ export class Pack {
                 size += 1;
                 continue;
             }
-            if (typeof value === "number") {
-                size += 1 + 4;
+            if (value instanceof Pack) {
+                size += 1 + value.sizeOrThrow();
                 continue;
             }
-            if (typeof value === "bigint") {
-                const text = value.toString(16);
-                const data = Uint8Array.fromHex(text.length % 2 === 1 ? "0" + text : text);
-                size += 1 + 4 + data.length;
+            if (typeof value === "number") {
+                size += 1 + 4;
                 continue;
             }
             if (value instanceof Uint8Array) {
                 size += 1 + 4 + value.length;
                 continue;
             }
-            if (value instanceof Pack) {
-                size += 1 + value.sizeOrThrow();
+            if (typeof value === "string") {
+                const data = new TextEncoder().encode(value);
+                size += 1 + 4 + data.length;
+                continue;
+            }
+            if (typeof value === "bigint") {
+                const text = value.toString(16);
+                const data = Uint8Array.fromHex(text.length % 2 === 1 ? "0" + text : text);
+                size += 1 + 4 + data.length;
                 continue;
             }
             throw new Error("Unknown pack value");
@@ -40,17 +45,14 @@ export class Pack {
                 cursor.writeUint8OrThrow(1);
                 continue;
             }
-            if (typeof value === "number") {
+            if (value instanceof Pack) {
                 cursor.writeUint8OrThrow(2);
-                cursor.writeFloat64OrThrow(value, true);
+                value.writeOrThrow(cursor);
                 continue;
             }
-            if (typeof value === "bigint") {
+            if (typeof value === "number") {
                 cursor.writeUint8OrThrow(3);
-                const text = value.toString(16);
-                const data = Uint8Array.fromHex(text.length % 2 === 1 ? "0" + text : text);
-                cursor.writeUint32OrThrow(data.length, true);
-                cursor.writeOrThrow(data);
+                cursor.writeFloat64OrThrow(value, true);
                 continue;
             }
             if (value instanceof Uint8Array) {
@@ -59,9 +61,19 @@ export class Pack {
                 cursor.writeOrThrow(value);
                 continue;
             }
-            if (value instanceof Pack) {
+            if (typeof value === "string") {
                 cursor.writeUint8OrThrow(5);
-                value.writeOrThrow(cursor);
+                const data = new TextEncoder().encode(value);
+                cursor.writeUint32OrThrow(data.length, true);
+                cursor.writeOrThrow(data);
+                continue;
+            }
+            if (typeof value === "bigint") {
+                cursor.writeUint8OrThrow(6);
+                const text = value.toString(16);
+                const data = Uint8Array.fromHex(text.length % 2 === 1 ? "0" + text : text);
+                cursor.writeUint32OrThrow(data.length, true);
+                cursor.writeOrThrow(data);
                 continue;
             }
             throw new Error("Unknown pack value");
@@ -82,13 +94,11 @@ export class Pack {
                 continue;
             }
             if (type === 2) {
-                values.push(cursor.readFloat64OrThrow(true));
+                values.push(Pack.readOrThrow(cursor));
                 continue;
             }
             if (type === 3) {
-                const size = cursor.readUint32OrThrow(true);
-                const data = cursor.readOrThrow(size);
-                values.push(BigInt("0x" + data.toHex()));
+                values.push(cursor.readFloat64OrThrow(true));
                 continue;
             }
             if (type === 4) {
@@ -97,7 +107,15 @@ export class Pack {
                 continue;
             }
             if (type === 5) {
-                values.push(Pack.readOrThrow(cursor));
+                const size = cursor.readUint32OrThrow(true);
+                const data = cursor.readOrThrow(size);
+                values.push(new TextDecoder().decode(data));
+                continue;
+            }
+            if (type === 6) {
+                const size = cursor.readUint32OrThrow(true);
+                const data = cursor.readOrThrow(size);
+                values.push(BigInt("0x" + data.toHex()));
                 continue;
             }
             throw new Error("Unknown pack type");

package/out/mods/worker/bin.js

@@ -89,14 +89,14 @@ function run(module, method, params, mode, maxsparks) {
                 const view = new Uint8Array(memory.buffer, offset >>> 0, length >>> 0);
                 return view.slice();
             },
-            size: (blob) => {
-                return blob.length;
-            },
             load: (blob, offset) => {
                 const { memory } = current.instance.exports;
                 const view = new Uint8Array(memory.buffer, offset >>> 0, blob.length);
                 view.set(blob);
             },
+            length: (blob) => {
+                return blob.length;
+            },
             concat: (left, right) => {
                 const concat = new Uint8Array(left.length + right.length);
                 concat.set(left, 0);
@@ -106,17 +106,55 @@ function run(module, method, params, mode, maxsparks) {
             equals: (left, right) => {
                 return !Buffer.compare(left, right);
             },
-            from_base16: (text) => {
-                return Uint8Array.fromHex(new TextDecoder().decode(text));
+            includes: (haystack, needle) => {
+                return haystack.toHex().includes(needle.toHex());
             },
-            from_base64: (text) => {
-                return Uint8Array.fromBase64(new TextDecoder().decode(text));
+            slice: (blob, start, end) => {
+                return blob.slice(start >>> 0, end >>> 0);
+            },
+            from_base16: (text) => {
+                return Uint8Array.fromHex(text);
             },
             to_base16: (bytes) => {
-                return new TextEncoder().encode(bytes.toHex());
+                return bytes.toHex();
+            },
+            from_base64: (text) => {
+                return Uint8Array.fromBase64(text);
             },
             to_base64: (bytes) => {
-                return new TextEncoder().encode(bytes.toBase64());
+                return bytes.toBase64();
+            },
+        };
+        imports["texts"] = {
+            length: (text) => {
+                return new TextEncoder().encode(text).length;
+            },
+            concat: (left, right) => {
+                return left + right;
+            },
+            equals: (left, right) => {
+                return left === right;
+            },
+            includes: (haystack, needle) => {
+                return haystack.includes(needle);
+            },
+            slice: (text, start, end) => {
+                return text.slice(start >>> 0, end >>> 0);
+            },
+            from_utf8: (bytes) => {
+                return new TextDecoder().decode(bytes);
+            },
+            to_utf8: (text) => {
+                return new TextEncoder().encode(text);
+            },
+            to_uppercase: (text) => {
+                return text.toUpperCase();
+            },
+            to_lowercase: (text) => {
+                return text.toLowerCase();
+            },
+            trim: (text) => {
+                return text.trim();
             }
         };
         imports["packs"] = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@hazae41/bobine",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "A blockchain in your garage",
   "repository": "github:hazae41/bobine",
   "author": "hazae41",
@@ -11,8 +11,8 @@
     "version": "deno -RW ./x.vsync.ts && git add deno.json",
     "prepare": "deno -RW ./x.dsync.ts && deno install",
     "prepack": "rm -rf ./out && tsc && tscousin",
-    "produce": "deno run -A ./src/bin.ts serve --env=./.env.local",
-    "develop": "deno run -A ./src/bin.ts serve --env=./.env.local --dev"
+    "produce": "deno run -A ./src/mod.ts serve --env=./.env.local",
+    "develop": "deno run -A ./src/mod.ts serve --env=./.env.local --dev"
   },
   "files": [
     "./out"