cajonzero 0.1.2 → 0.1.3

package/dist/scaffold.js

@@ -1,7 +1,8 @@
-import { readFileSync, existsSync, statSync, mkdirSync, writeFileSync, readdirSync } from 'fs';
-import path from 'path';
+import { readFileSync, existsSync, statSync, mkdirSync, writeFileSync, renameSync, rmSync, cpSync, readdirSync } from 'fs';
+import path3 from 'path';
 import { fileURLToPath } from 'url';
-import { randomBytes } from 'crypto';
+import { randomBytes, createHash } from 'crypto';
+import { createRequire } from 'module';
 
 // src/scaffold/templates.ts
 var SCAFFOLD_ENTRY_PATH = "src/index.ts";
@@ -71,7 +72,7 @@ var SCAFFOLD_CONFIG_CONTENT = `${JSON.stringify(
 `;
 var SCAFFOLD_MAPS_CONTENT = `${JSON.stringify({ version: 1, maps: [] }, null, 2)}
 `;
-var SHIP_UI_SCRIPT = `node -e "const fs=require('node:fs'),p=require('node:path');fs.cpSync(p.join(p.dirname(require.resolve('cajonzero/package.json')),'dist','ui'),p.join('dist','ui'),{recursive:true,force:true})"`;
+var PREPARE_ASSETS = "cj0 worker prepare";
 function packageJson(options) {
   const manifest = {
     name: options.packageName,
@@ -79,12 +80,14 @@ function packageJson(options) {
     private: true,
     type: "module",
     scripts: {
-      dev: `${SHIP_UI_SCRIPT} && wrangler dev`,
-      build: `${SHIP_UI_SCRIPT} && wrangler deploy --dry-run`,
-      deploy: `${SHIP_UI_SCRIPT} && wrangler deploy`,
+      dev: `${PREPARE_ASSETS} && wrangler dev`,
+      build: `${PREPARE_ASSETS} && cj0 worker build-seed && wrangler deploy --dry-run`,
+      // Deploy always rebuilds: map content can change without `version` being
+      // bumped, and the room prefers the pack over the live CDN graph.
+      deploy: `${PREPARE_ASSETS} && cj0 worker build-seed --force && wrangler deploy`,
       // `prepare` also runs after `npm install`, so a plain install leaves a
-      // ready-to-deploy project.
-      prepare: SHIP_UI_SCRIPT
+      // ready-to-deploy project. Seed packs are network work and stay out of it.
+      prepare: PREPARE_ASSETS
     },
     dependencies: {
       cajonzero: options.cajonzeroRange,
@@ -113,6 +116,8 @@ function wranglerConfig(options) {
     "  // cajonzero ships the built assets into this directory.",
     '  "assets": {',
     '    "directory": "dist/ui",',
+    "    // Binding so the room can read seed packs bundled at deploy time.",
+    '    "binding": "ASSETS",',
     "    // History routing: deep links (/play/x, /admin/bans) boot index.html.",
     '    "not_found_handling": "single-page-application",',
     '    "run_worker_first": ["/api/*", "/runtime/*"]',
@@ -163,17 +168,18 @@ function readme(options) {
     "",
     "```bash",
     "npm install",
-    "npx cj0 setup   # \u4EA4\u4E92\u5F0F\u914D\u7F6E\u5FC5\u9700/\u53EF\u9009\u7684 ENV",
+    "npx cj0 setup   # \u4EA4\u4E92\u5F0F\u914D\u7F6E ENV + KV namespace",
     "npm run dev     # http://localhost:8787",
     "```",
     "",
     "## \u73AF\u5883\u53D8\u91CF",
     "",
     "`cj0 setup` \u628A\u975E\u5BC6\u94A5\u5199\u5165 `wrangler.jsonc` \u7684 `vars`\uFF0C\u628A\u5BC6\u94A5\u5199\u5165 `.dev.vars`\uFF08\u672C\u5730\uFF09\u3002",
-    "\u90E8\u7F72\u65F6\u5BC6\u94A5\u8981\u5355\u72EC\u8BBE\u7F6E\uFF1A",
+    "KV namespace \u4E5F\u7531 `cj0 setup` \u914D\u7F6E\uFF1A\u56DE\u8F66\u4F1A\u81EA\u52A8\u8C03\u7528 wrangler \u521B\u5EFA\u5E76\u5199\u56DE id\uFF08\u9700\u5148\u767B\u5F55\uFF09\uFF0C",
+    "\u4E5F\u53EF\u4EE5\u7C98\u8D34\u5DF2\u6709 id\u3002\u79BB\u7EBF\u65F6\u624B\u52A8\u8FD0\u884C\uFF1A",
     "",
     "```bash",
-    "npx wrangler kv namespace create CAJONZERO_KV   # id \u586B\u8FDB wrangler.jsonc",
+    "npx wrangler kv namespace create <name> --update-config --binding CAJONZERO_KV",
     "npx wrangler secret put CAJONZERO_SESSION_SECRET",
     "npx wrangler secret put BOX_PLAY_ADMIN_TOKEN",
     "```",
@@ -264,7 +270,7 @@ function readCajonzeroPackage(manifestPath) {
   return { version, wranglerRange, unstorageRange };
 }
 function toPackageName(folder) {
-  const base = path.basename(folder);
+  const base = path3.basename(folder);
   const slug = base.toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[-._]+/, "").replace(/[-._]+$/, "");
   return slug.length > 0 ? slug : "cajonzero-app";
 }
@@ -279,7 +285,7 @@ function createProject(folder, options = {}) {
     throw new ScaffoldError("INVALID_TARGET", "create requires a target folder");
   }
   const cwd = options.cwd ?? process.cwd();
-  const target = path.resolve(cwd, name);
+  const target = path3.resolve(cwd, name);
   if (existsSync(target) && !statSync(target).isDirectory()) {
     throw new ScaffoldError("INVALID_TARGET", `target exists and is not a directory: ${target}`);
   }
@@ -302,8 +308,8 @@ function createProject(folder, options = {}) {
   });
   mkdirSync(target, { recursive: true });
   for (const file of files) {
-    const fullPath = path.join(target, file.path);
-    mkdirSync(path.dirname(fullPath), { recursive: true });
+    const fullPath = path3.join(target, file.path);
+    mkdirSync(path3.dirname(fullPath), { recursive: true });
     writeFileSync(fullPath, file.content, "utf8");
   }
   return { target, files: files.map((file) => file.path) };
@@ -388,6 +394,13 @@ var SETUP_FIELDS = [
     required: true,
     hint: "\u7559\u7A7A\u81EA\u52A8\u751F\u6210\uFF1B\u672C\u5730\u5199\u5165 .dev.vars"
   },
+  {
+    name: "CAJONZERO_KV_ID",
+    label: "KV namespace id",
+    kind: "kv",
+    required: true,
+    hint: "\u56DE\u8F66\u81EA\u52A8\u521B\u5EFA\uFF08\u9700 wrangler \u767B\u5F55\uFF09\u6216\u7C98\u8D34\u5DF2\u6709 id"
+  },
   {
     name: "CAJONZERO_ENV",
     label: "\u90E8\u7F72\u540D\u79F0",
@@ -435,10 +448,11 @@ function serializeDevVars(values) {
   return `${lines.join("\n")}
 `;
 }
-function findVarsBlock(raw) {
-  const match = /"vars"\s*:\s*\{/.exec(raw);
+function findKeyBlock(raw, key, openChar) {
+  const closeChar = openChar === "{" ? "}" : "]";
+  const match = new RegExp(`"${key}"\\s*:\\s*\\${openChar}`).exec(raw);
   if (match === null) return null;
-  const open = raw.indexOf("{", match.index);
+  const open = raw.indexOf(openChar, match.index);
   let depth = 0;
   let inString = false;
   let escaped = false;
@@ -451,8 +465,8 @@ function findVarsBlock(raw) {
       continue;
     }
     if (ch === '"') inString = true;
-    else if (ch === "{") depth += 1;
-    else if (ch === "}") {
+    else if (ch === openChar) depth += 1;
+    else if (ch === closeChar) {
       depth -= 1;
       if (depth === 0) {
         const lineStart = raw.lastIndexOf("\n", match.index) + 1;
@@ -463,7 +477,10 @@ function findVarsBlock(raw) {
   }
   return null;
 }
-function parseJsoncObject(text) {
+function findVarsBlock(raw) {
+  return findKeyBlock(raw, "vars", "{");
+}
+function stripJsoncComments(text) {
   let out = "";
   let inString = false;
   let escaped = false;
@@ -494,13 +511,95 @@ function parseJsoncObject(text) {
     }
     out += ch;
   }
-  out = out.replace(/,(\s*[}\]])/g, "$1");
+  return out;
+}
+function parseJsonc(text) {
   try {
-    const parsed = JSON.parse(out);
-    return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : {};
+    const clean = text.replace(/^\uFEFF/, "");
+    return JSON.parse(stripJsoncComments(clean).replace(/,(\s*[}\]])/g, "$1"));
   } catch {
-    return {};
+    return void 0;
+  }
+}
+function parseJsoncObject(text) {
+  const parsed = parseJsonc(text);
+  return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : {};
+}
+function parseJsoncArray(text) {
+  const parsed = parseJsonc(text);
+  return Array.isArray(parsed) ? parsed : [];
+}
+function escapeRegExp(text) {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findBindingObject(raw, block, binding) {
+  const bindingPattern = new RegExp(`"binding"\\s*:\\s*"${escapeRegExp(binding)}"`);
+  const stack = [];
+  let inString = false;
+  let escaped = false;
+  for (let i = block.open; i <= block.close; i += 1) {
+    const ch = raw[i];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === '"') inString = false;
+      continue;
+    }
+    if (ch === '"') inString = true;
+    else if (ch === "{") stack.push(i);
+    else if (ch === "}") {
+      const start = stack.pop();
+      if (start !== void 0 && bindingPattern.test(raw.slice(start, i + 1))) {
+        const lineStart = raw.lastIndexOf("\n", start) + 1;
+        const indent = /^\s*/.exec(raw.slice(lineStart, start))?.[0] ?? "    ";
+        return { start, end: i + 1, indent };
+      }
+    }
   }
+  return null;
+}
+function readWranglerKvNamespaceId(raw, binding = "CAJONZERO_KV") {
+  const block = findKeyBlock(raw, "kv_namespaces", "[");
+  if (block === null) return void 0;
+  const entries = parseJsoncArray(raw.slice(block.open, block.close + 1));
+  for (const entry of entries) {
+    if (typeof entry !== "object" || entry === null) continue;
+    const record = entry;
+    if (record["binding"] !== binding) continue;
+    const id = record["id"];
+    return typeof id === "string" && id.length > 0 ? id : void 0;
+  }
+  return void 0;
+}
+function setWranglerKvNamespaceId(raw, binding, id) {
+  const block = findKeyBlock(raw, "kv_namespaces", "[");
+  if (block !== null) {
+    const entry = findBindingObject(raw, block, binding);
+    if (entry !== null) {
+      const entryText = raw.slice(entry.start, entry.end);
+      const nextEntry = /"id"\s*:/.test(entryText) ? entryText.replace(/("id"\s*:\s*)"(?:[^"\\]|\\.)*"/, `$1${JSON.stringify(id)}`) : entryText.replace(
+        /("binding"\s*:\s*"(?:[^"\\]|\\.)*")/,
+        `$1,
+${entry.indent}"id": ${JSON.stringify(id)}`
+      );
+      return raw.slice(0, entry.start) + nextEntry + raw.slice(entry.end);
+    }
+  }
+  const existing = block === null ? [] : parseJsoncArray(raw.slice(block.open, block.close + 1));
+  const filtered = existing.filter(
+    (entry) => !(typeof entry === "object" && entry !== null && entry["binding"] === binding)
+  );
+  const indent = block?.indent ?? "  ";
+  const arrayText = JSON.stringify([...filtered, { binding, id }], null, 2).split("\n").map((line, index) => index === 0 ? line : `${indent}${line}`).join("\n");
+  if (block !== null) {
+    return raw.slice(0, block.open) + arrayText + raw.slice(block.close + 1);
+  }
+  const close = raw.lastIndexOf("}");
+  if (close < 0) throw new Error("wrangler config is not a JSON object");
+  const body = raw.slice(0, close).trimEnd();
+  const separator = body.endsWith("{") || body.endsWith(",") ? "\n" : ",\n";
+  return `${body}${separator}${indent}"kv_namespaces": ${arrayText}
+${raw.slice(close)}`;
 }
 function setWranglerVars(raw, vars) {
   const managed = new Set(SETUP_FIELDS.filter((f) => f.kind === "var").map((f) => f.name));
@@ -543,26 +642,33 @@ function readSetupValues(cwd, configPath, devVarsPath) {
         if (typeof value === "string") out[key] = value;
       }
     }
+    const kvId = readWranglerKvNamespaceId(raw);
+    if (kvId !== void 0 && kvId !== SCAFFOLD_KV_PLACEHOLDER_ID) {
+      out["CAJONZERO_KV_ID"] = kvId;
+    }
   }
   return out;
 }
 function applySetup(options) {
   const cwd = options.cwd ?? process.cwd();
-  const configPath = path.resolve(cwd, options.configPath ?? "wrangler.jsonc");
-  const devVarsPath = path.join(path.dirname(configPath), ".dev.vars");
+  const configPath = path3.resolve(cwd, options.configPath ?? "wrangler.jsonc");
+  const devVarsPath = path3.join(path3.dirname(configPath), ".dev.vars");
   if (!existsSync(configPath)) {
-    throw new Error(`\u627E\u4E0D\u5230 ${path.basename(configPath)}\uFF0C\u8BF7\u5728 cj0 create \u751F\u6210\u7684\u9879\u76EE\u76EE\u5F55\u4E2D\u8FD0\u884C`);
+    throw new Error(`\u627E\u4E0D\u5230 ${path3.basename(configPath)}\uFF0C\u8BF7\u5728 cj0 create \u751F\u6210\u7684\u9879\u76EE\u76EE\u5F55\u4E2D\u8FD0\u884C`);
   }
   const vars = {};
   const secrets = {};
+  let kvId;
   for (const field of SETUP_FIELDS) {
     const value = options.values[field.name]?.trim();
     if (value === void 0 || value.length === 0) continue;
     if (field.kind === "secret") secrets[field.name] = value;
+    else if (field.kind === "kv") kvId = value;
     else vars[field.name] = value;
   }
   const raw = readFileSync(configPath, "utf8");
-  const next = setWranglerVars(raw, vars);
+  let next = setWranglerVars(raw, vars);
+  if (kvId !== void 0) next = setWranglerKvNamespaceId(next, "CAJONZERO_KV", kvId);
   if (next !== raw) writeFileSync(configPath, next, "utf8");
   const existingDev = existsSync(devVarsPath) ? parseDevVars(readFileSync(devVarsPath, "utf8")) : {};
   const managedSecrets = new Set(
@@ -574,9 +680,164 @@ function applySetup(options) {
   }
   Object.assign(mergedDev, secrets);
   writeFileSync(devVarsPath, serializeDevVars(mergedDev), "utf8");
-  return { configPath, devVarsPath, vars, secrets };
+  return { configPath, devVarsPath, vars, secrets, ...kvId !== void 0 ? { kvId } : {} };
+}
+var ASSETS_STAMP_FILE = ".cajonzero-assets.json";
+var ASSETS_SEED_DIR = "seed";
+var DEFAULT_CONFIG = "wrangler.jsonc";
+function resolvePackageRoot() {
+  try {
+    return path3.dirname(createRequire(import.meta.url).resolve("cajonzero/package.json"));
+  } catch {
+    return path3.dirname(fileURLToPath(new URL("../../package.json", import.meta.url)));
+  }
+}
+function readPackageVersion(root) {
+  try {
+    const parsed = JSON.parse(readFileSync(path3.join(root, "package.json"), "utf8"));
+    return typeof parsed.version === "string" ? parsed.version : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function readWranglerAssetsDirectory(configPath) {
+  if (!existsSync(configPath)) {
+    throw new Error(`\u627E\u4E0D\u5230 ${path3.basename(configPath)}\uFF0C\u8BF7\u5728 cj0 create \u751F\u6210\u7684\u9879\u76EE\u76EE\u5F55\u4E2D\u8FD0\u884C`);
+  }
+  const ext = path3.extname(configPath).toLowerCase();
+  if (ext !== ".json" && ext !== ".jsonc") {
+    throw new Error(
+      `\u4E0D\u652F\u6301\u8BFB\u53D6 ${path3.basename(configPath)}\uFF08\u53EA\u652F\u6301 JSON/JSONC wrangler \u914D\u7F6E\uFF1B\u7528 --assets \u6307\u5B9A\u76EE\u5F55\uFF09`
+    );
+  }
+  const parsed = parseJsoncObject(readFileSync(configPath, "utf8"));
+  const assets = parsed["assets"];
+  if (typeof assets === "object" && assets !== null && !Array.isArray(assets)) {
+    const directory = assets["directory"];
+    if (typeof directory === "string" && directory.length > 0) return directory;
+  }
+  return void 0;
+}
+function fingerprintTree(dir) {
+  const entries = [];
+  const walk = (relative) => {
+    const absolute = relative.length === 0 ? dir : path3.join(dir, relative);
+    for (const entry of readdirSync(absolute, { withFileTypes: true })) {
+      if (entry.name === ASSETS_STAMP_FILE) continue;
+      const child = relative.length === 0 ? entry.name : `${relative}/${entry.name}`;
+      if (entry.isDirectory()) walk(child);
+      else if (entry.isFile()) entries.push(child);
+    }
+  };
+  walk("");
+  entries.sort();
+  const hash = createHash("sha256");
+  let bytes = 0;
+  for (const relative of entries) {
+    const content = readFileSync(path3.join(dir, relative));
+    bytes += content.length;
+    hash.update(relative);
+    hash.update("\0");
+    hash.update(content);
+    hash.update("\0");
+  }
+  return { files: entries.length, bytes, hash: hash.digest("hex") };
+}
+function readStamp(targetDir) {
+  try {
+    const parsed = JSON.parse(
+      readFileSync(path3.join(targetDir, ASSETS_STAMP_FILE), "utf8")
+    );
+    if (parsed.version !== 1 || typeof parsed.fingerprint !== "string") return void 0;
+    return { version: 1, fingerprint: parsed.fingerprint, packageVersion: parsed.packageVersion };
+  } catch {
+    return void 0;
+  }
+}
+function assertSafeTarget(targetDir, sourceDir, configDir) {
+  const contains = (parent, child) => child === parent || child.startsWith(`${parent}${path3.sep}`);
+  if (targetDir === path3.parse(targetDir).root) {
+    throw new Error(`\u62D2\u7EDD\u628A\u6587\u4EF6\u7CFB\u7EDF\u6839\u76EE\u5F55\u4F5C\u4E3A assets \u76EE\u5F55\uFF1A${targetDir}`);
+  }
+  if (contains(targetDir, configDir) || contains(targetDir, sourceDir) || contains(sourceDir, targetDir)) {
+    throw new Error(`assets \u76EE\u5F55\u4E0D\u80FD\u5305\u542B\u9879\u76EE\u914D\u7F6E/cajonzero \u8D44\u6E90\u76EE\u5F55\uFF1A${targetDir}`);
+  }
+}
+async function prepareWorkerAssets(options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const configPath = path3.resolve(cwd, options.configPath ?? DEFAULT_CONFIG);
+  const configDir = path3.dirname(configPath);
+  const packageRoot = resolvePackageRoot();
+  const sourceDir = path3.resolve(options.sourceDir ?? path3.join(packageRoot, "dist", "ui"));
+  if (!existsSync(sourceDir)) {
+    throw new Error(
+      `cajonzero \u7684 UI \u8D44\u6E90\u7F3A\u5931\uFF1A${sourceDir}\uFF08\u8BF7\u91CD\u65B0\u5B89\u88C5 cajonzero\uFF0C\u6216\u5728\u6E90\u7801\u4ED3\u5E93\u5148 npm run build\uFF09`
+    );
+  }
+  const configured = options.assetsDir ?? readWranglerAssetsDirectory(configPath);
+  if (configured === void 0) {
+    throw new Error(
+      `${path3.basename(configPath)} \u672A\u914D\u7F6E assets.directory\uFF1B\u7528 --assets <dir> \u6307\u5B9A\u8F93\u51FA\u76EE\u5F55`
+    );
+  }
+  const targetDir = path3.resolve(configDir, configured);
+  assertSafeTarget(targetDir, sourceDir, configDir);
+  const source = fingerprintTree(sourceDir);
+  const stamp = readStamp(targetDir);
+  if (!options.force && stamp?.fingerprint === source.hash && existsSync(targetDir)) {
+    return {
+      sourceDir,
+      targetDir,
+      fingerprint: source.hash,
+      copied: false,
+      files: source.files,
+      bytes: source.bytes
+    };
+  }
+  const seedDir = path3.join(targetDir, ASSETS_SEED_DIR);
+  const seedBackup = `${targetDir}.${ASSETS_SEED_DIR}-backup`;
+  if (!existsSync(seedDir) && existsSync(seedBackup)) {
+    mkdirSync(path3.dirname(seedDir), { recursive: true });
+    renameSync(seedBackup, seedDir);
+  }
+  let hasSeed = false;
+  if (existsSync(seedDir)) {
+    rmSync(seedBackup, { recursive: true, force: true });
+    renameSync(seedDir, seedBackup);
+    hasSeed = true;
+  }
+  try {
+    rmSync(targetDir, { recursive: true, force: true });
+    mkdirSync(targetDir, { recursive: true });
+    cpSync(sourceDir, targetDir, {
+      recursive: true,
+      force: true,
+      filter: (from) => path3.basename(from) !== ASSETS_STAMP_FILE
+    });
+  } finally {
+    if (hasSeed && existsSync(seedBackup)) {
+      mkdirSync(targetDir, { recursive: true });
+      rmSync(seedDir, { recursive: true, force: true });
+      renameSync(seedBackup, seedDir);
+    }
+  }
+  const next = {
+    version: 1,
+    fingerprint: source.hash,
+    packageVersion: readPackageVersion(packageRoot)
+  };
+  writeFileSync(path3.join(targetDir, ASSETS_STAMP_FILE), `${JSON.stringify(next, null, 2)}
+`, "utf8");
+  return {
+    sourceDir,
+    targetDir,
+    fingerprint: source.hash,
+    copied: true,
+    files: source.files,
+    bytes: source.bytes
+  };
 }
 
-export { SCAFFOLD_COMPATIBILITY_DATE, SCAFFOLD_CONFIG_CONTENT, SCAFFOLD_ENTRY_CONTENT, SCAFFOLD_ENTRY_PATH, SCAFFOLD_KV_PLACEHOLDER_ID, SCAFFOLD_MAPS_CONTENT, SETUP_FIELDS, ScaffoldError, applySetup, buildScaffoldFiles, createProject, generateAdminToken, generateSecret, parseDevVars, readCajonzeroPackage, readSetupValues, serializeDevVars, setWranglerVars, suggestedValue, toPackageName };
+export { ASSETS_SEED_DIR, ASSETS_STAMP_FILE, SCAFFOLD_COMPATIBILITY_DATE, SCAFFOLD_CONFIG_CONTENT, SCAFFOLD_ENTRY_CONTENT, SCAFFOLD_ENTRY_PATH, SCAFFOLD_KV_PLACEHOLDER_ID, SCAFFOLD_MAPS_CONTENT, SETUP_FIELDS, ScaffoldError, applySetup, buildScaffoldFiles, createProject, generateAdminToken, generateSecret, parseDevVars, parseJsoncObject, prepareWorkerAssets, readCajonzeroPackage, readSetupValues, readWranglerAssetsDirectory, readWranglerKvNamespaceId, serializeDevVars, setWranglerKvNamespaceId, setWranglerVars, suggestedValue, toPackageName };
 //# sourceMappingURL=scaffold.js.map
 //# sourceMappingURL=scaffold.js.map

package/dist/serve.d.ts

@@ -1,5 +1,5 @@
 import { ExecutionContext } from 'hono';
-import { R as Room, D as DurableObjectNamespace, b as Env } from './providers-BX7e4pNW.js';
+import { R as Room, D as DurableObjectNamespace, b as Env } from './providers-BwJKzGkd.js';
 import { StorageSource, EnvProvider, SettingDefaults } from './core.js';
 import 'unstorage';
 import 'gl-matrix';